smb3: remove unused flag passed into close functions
[ Upstream commit 9e8fae2597
]
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>
5.4-rM2-2.2.x-imx-squashed
parent
55a4dff288
commit
d17a9571e3
|
@ -2945,8 +2945,8 @@ SMB2_close_free(struct smb_rqst *rqst)
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
SMB2_close_flags(const unsigned int xid, struct cifs_tcon *tcon,
|
SMB2_close(const unsigned int xid, struct cifs_tcon *tcon,
|
||||||
u64 persistent_fid, u64 volatile_fid, int flags)
|
u64 persistent_fid, u64 volatile_fid)
|
||||||
{
|
{
|
||||||
struct smb_rqst rqst;
|
struct smb_rqst rqst;
|
||||||
struct smb2_close_rsp *rsp = NULL;
|
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;
|
struct kvec rsp_iov;
|
||||||
int resp_buftype = CIFS_NO_BUFFER;
|
int resp_buftype = CIFS_NO_BUFFER;
|
||||||
int rc = 0;
|
int rc = 0;
|
||||||
|
int flags = 0;
|
||||||
|
|
||||||
cifs_dbg(FYI, "Close\n");
|
cifs_dbg(FYI, "Close\n");
|
||||||
|
|
||||||
|
@ -2993,27 +2994,17 @@ SMB2_close_flags(const unsigned int xid, struct cifs_tcon *tcon,
|
||||||
close_exit:
|
close_exit:
|
||||||
SMB2_close_free(&rqst);
|
SMB2_close_free(&rqst);
|
||||||
free_rsp_buf(resp_buftype, rsp);
|
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 */
|
/* retry close in a worker thread if this one is interrupted */
|
||||||
if (rc == -EINTR) {
|
if (rc == -EINTR) {
|
||||||
|
int tmp_rc;
|
||||||
|
|
||||||
tmp_rc = smb2_handle_cancelled_close(tcon, persistent_fid,
|
tmp_rc = smb2_handle_cancelled_close(tcon, persistent_fid,
|
||||||
volatile_fid);
|
volatile_fid);
|
||||||
if (tmp_rc)
|
if (tmp_rc)
|
||||||
cifs_dbg(VFS, "handle cancelled close fid 0x%llx returned error %d\n",
|
cifs_dbg(VFS, "handle cancelled close fid 0x%llx returned error %d\n",
|
||||||
persistent_fid, tmp_rc);
|
persistent_fid, tmp_rc);
|
||||||
}
|
}
|
||||||
|
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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,
|
extern int SMB2_close(const unsigned int xid, struct cifs_tcon *tcon,
|
||||||
u64 persistent_file_id, u64 volatile_file_id);
|
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,
|
extern int SMB2_close_init(struct cifs_tcon *tcon, struct smb_rqst *rqst,
|
||||||
u64 persistent_file_id, u64 volatile_file_id);
|
u64 persistent_file_id, u64 volatile_file_id);
|
||||||
extern void SMB2_close_free(struct smb_rqst *rqst);
|
extern void SMB2_close_free(struct smb_rqst *rqst);
|
||||||
|
|
Loading…
Reference in New Issue