Skip to content

Commit 9e8fae2

Browse files
committed
smb3: remove unused flag passed into close functions
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 <[email protected]> Reviewed-by: Pavel Shilovsky <[email protected]> Reviewed-by: Ronnie Sahlberg <[email protected]>
1 parent a9f76cf commit 9e8fae2

File tree

2 files changed

+5
-16
lines changed

2 files changed

+5
-16
lines changed

fs/cifs/smb2pdu.c

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2959,8 +2959,8 @@ SMB2_close_free(struct smb_rqst *rqst)
29592959
}
29602960

29612961
int
2962-
SMB2_close_flags(const unsigned int xid, struct cifs_tcon *tcon,
2963-
u64 persistent_fid, u64 volatile_fid, int flags)
2962+
SMB2_close(const unsigned int xid, struct cifs_tcon *tcon,
2963+
u64 persistent_fid, u64 volatile_fid)
29642964
{
29652965
struct smb_rqst rqst;
29662966
struct smb2_close_rsp *rsp = NULL;
@@ -2969,6 +2969,7 @@ SMB2_close_flags(const unsigned int xid, struct cifs_tcon *tcon,
29692969
struct kvec rsp_iov;
29702970
int resp_buftype = CIFS_NO_BUFFER;
29712971
int rc = 0;
2972+
int flags = 0;
29722973

29732974
cifs_dbg(FYI, "Close\n");
29742975

@@ -3007,27 +3008,17 @@ SMB2_close_flags(const unsigned int xid, struct cifs_tcon *tcon,
30073008
close_exit:
30083009
SMB2_close_free(&rqst);
30093010
free_rsp_buf(resp_buftype, rsp);
3010-
return rc;
3011-
}
3012-
3013-
int
3014-
SMB2_close(const unsigned int xid, struct cifs_tcon *tcon,
3015-
u64 persistent_fid, u64 volatile_fid)
3016-
{
3017-
int rc;
3018-
int tmp_rc;
3019-
3020-
rc = SMB2_close_flags(xid, tcon, persistent_fid, volatile_fid, 0);
30213011

30223012
/* retry close in a worker thread if this one is interrupted */
30233013
if (rc == -EINTR) {
3014+
int tmp_rc;
3015+
30243016
tmp_rc = smb2_handle_cancelled_close(tcon, persistent_fid,
30253017
volatile_fid);
30263018
if (tmp_rc)
30273019
cifs_dbg(VFS, "handle cancelled close fid 0x%llx returned error %d\n",
30283020
persistent_fid, tmp_rc);
30293021
}
3030-
30313022
return rc;
30323023
}
30333024

fs/cifs/smb2proto.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,6 @@ extern int SMB2_change_notify(const unsigned int xid, struct cifs_tcon *tcon,
157157

158158
extern int SMB2_close(const unsigned int xid, struct cifs_tcon *tcon,
159159
u64 persistent_file_id, u64 volatile_file_id);
160-
extern int SMB2_close_flags(const unsigned int xid, struct cifs_tcon *tcon,
161-
u64 persistent_fid, u64 volatile_fid, int flags);
162160
extern int SMB2_close_init(struct cifs_tcon *tcon, struct smb_rqst *rqst,
163161
u64 persistent_file_id, u64 volatile_file_id);
164162
extern void SMB2_close_free(struct smb_rqst *rqst);

0 commit comments

Comments
 (0)