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

Commit 97ca1762 authored by Ronnie Sahlberg's avatar Ronnie Sahlberg Committed by Steve French
Browse files

cifs: add a new SMB2_close_flags function 



And make SMB2_close just a wrapper for SMB2_close_flags.
We need this as we will start to send SMB2_CLOSE pdus using special
flags.

Signed-off-by: default avatarRonnie Sahlberg <lsahlber@redhat.com>
Reviewed-by: default avatarPavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
parent 96164ab2

fs/cifs/smb2pdu.c

+9 −3
Original line number Diff line number Diff line
@@ -2164,8 +2164,8 @@ SMB2_set_compression(const unsigned int xid, struct cifs_tcon *tcon, 
}



int

SMB2_close(const unsigned int xid, struct cifs_tcon *tcon,

	   u64 persistent_fid, u64 volatile_fid)

SMB2_close_flags(const unsigned int xid, struct cifs_tcon *tcon,

		 u64 persistent_fid, u64 volatile_fid, int flags)

{

	struct smb2_close_req *req;

	struct smb2_close_rsp *rsp;
@@ -2174,7 +2174,6 @@ SMB2_close(const unsigned int xid, struct cifs_tcon *tcon, 
	struct kvec rsp_iov;

	int resp_buftype;

	int rc = 0;

	int flags = 0;

	unsigned int total_len;



	cifs_dbg(FYI, "Close\n");
@@ -2211,6 +2210,13 @@ SMB2_close(const unsigned int xid, struct cifs_tcon *tcon, 
	return rc;

}



int

SMB2_close(const unsigned int xid, struct cifs_tcon *tcon,

	   u64 persistent_fid, u64 volatile_fid)

{

	return SMB2_close_flags(xid, tcon, persistent_fid, volatile_fid, 0);

}



static int

validate_iov(struct TCP_Server_Info *server,

	     unsigned int offset, unsigned int buffer_length,

fs/cifs/smb2proto.h

+2 −0
Original line number Diff line number Diff line
@@ -131,6 +131,8 @@ extern int SMB2_ioctl(const unsigned int xid, struct cifs_tcon *tcon, 
		     char **out_data, u32 *plen /* returned data len */);

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_flush(const unsigned int xid, struct cifs_tcon *tcon,

		      u64 persistent_file_id, u64 volatile_file_id);

extern int SMB2_query_eas(const unsigned int xid, struct cifs_tcon *tcon,