Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d17a9571 authored by Steve French's avatar Steve French Committed by Greg Kroah-Hartman
Browse files

smb3: remove unused flag passed into close functions 



[ 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: default avatarSteve French <stfrench@microsoft.com>
Reviewed-by: default avatarPavel Shilovsky <pshilov@microsoft.com>
Reviewed-by: default avatarRonnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 55a4dff2

fs/cifs/smb2pdu.c

+5 −14
Original line number Diff line number Diff line
@@ -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;

}

fs/cifs/smb2proto.h

+0 −2
Original line number Diff line number Diff line
@@ -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);