| From 7df363f296664454575bfe39df1a7c172c248b55 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 2 Dec 2019 17:55:41 -0600 |
| Subject: smb3: remove unused flag passed into close functions |
| |
| From: Steve French <stfrench@microsoft.com> |
| |
| [ Upstream commit 9e8fae2597405ab1deac8909928eb8e99876f639 ] |
| |
| close was relayered to allow passing in an async flag which |
| is no longer needed in this path. Remove the unneeded parameter |
| "flags" passed in on close. |
| |
| Signed-off-by: Steve French <stfrench@microsoft.com> |
| Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com> |
| Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| fs/cifs/smb2pdu.c | 19 +++++-------------- |
| fs/cifs/smb2proto.h | 2 -- |
| 2 files changed, 5 insertions(+), 16 deletions(-) |
| |
| diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c |
| index 7ff05c06f2a4c..c095f2e6b0825 100644 |
| --- a/fs/cifs/smb2pdu.c |
| +++ b/fs/cifs/smb2pdu.c |
| @@ -2945,8 +2945,8 @@ SMB2_close_free(struct smb_rqst *rqst) |
| } |
| |
| int |
| -SMB2_close_flags(const unsigned int xid, struct cifs_tcon *tcon, |
| - u64 persistent_fid, u64 volatile_fid, int flags) |
| +SMB2_close(const unsigned int xid, struct cifs_tcon *tcon, |
| + u64 persistent_fid, u64 volatile_fid) |
| { |
| struct smb_rqst rqst; |
| struct smb2_close_rsp *rsp = NULL; |
| @@ -2955,6 +2955,7 @@ SMB2_close_flags(const unsigned int xid, struct cifs_tcon *tcon, |
| struct kvec rsp_iov; |
| int resp_buftype = CIFS_NO_BUFFER; |
| int rc = 0; |
| + int flags = 0; |
| |
| cifs_dbg(FYI, "Close\n"); |
| |
| @@ -2993,27 +2994,17 @@ SMB2_close_flags(const unsigned int xid, struct cifs_tcon *tcon, |
| close_exit: |
| SMB2_close_free(&rqst); |
| free_rsp_buf(resp_buftype, rsp); |
| - return rc; |
| -} |
| - |
| -int |
| -SMB2_close(const unsigned int xid, struct cifs_tcon *tcon, |
| - u64 persistent_fid, u64 volatile_fid) |
| -{ |
| - int rc; |
| - int tmp_rc; |
| - |
| - rc = SMB2_close_flags(xid, tcon, persistent_fid, volatile_fid, 0); |
| |
| /* retry close in a worker thread if this one is interrupted */ |
| if (rc == -EINTR) { |
| + int tmp_rc; |
| + |
| tmp_rc = smb2_handle_cancelled_close(tcon, persistent_fid, |
| volatile_fid); |
| if (tmp_rc) |
| cifs_dbg(VFS, "handle cancelled close fid 0x%llx returned error %d\n", |
| persistent_fid, tmp_rc); |
| } |
| - |
| return rc; |
| } |
| |
| diff --git a/fs/cifs/smb2proto.h b/fs/cifs/smb2proto.h |
| index 2a12a2fa38a22..57f7075a35871 100644 |
| --- a/fs/cifs/smb2proto.h |
| +++ b/fs/cifs/smb2proto.h |
| @@ -156,8 +156,6 @@ extern int SMB2_change_notify(const unsigned int xid, struct cifs_tcon *tcon, |
| |
| extern int SMB2_close(const unsigned int xid, struct cifs_tcon *tcon, |
| u64 persistent_file_id, u64 volatile_file_id); |
| -extern int SMB2_close_flags(const unsigned int xid, struct cifs_tcon *tcon, |
| - u64 persistent_fid, u64 volatile_fid, int flags); |
| extern int SMB2_close_init(struct cifs_tcon *tcon, struct smb_rqst *rqst, |
| u64 persistent_file_id, u64 volatile_file_id); |
| extern void SMB2_close_free(struct smb_rqst *rqst); |
| -- |
| 2.27.0 |
| |
