Commit 3764cbd1 authored by Ronnie Sahlberg's avatar Ronnie Sahlberg Committed by Steve French
Browse files

cifs: remove the is_falloc argument to SMB2_set_eof 



We never pass is_falloc==true here anyway and if we ever need to support
is_falloc in the future, SMB2_set_eof is such a trivial wrapper around
send_set_info() that we can/should just create a differently named wrapper
for that new functionality.

Signed-off-by: default avatarRonnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent dcbf9103

fs/cifs/smb2ops.c

+1 −1
Original line number Diff line number Diff line
@@ -1307,7 +1307,7 @@ smb2_set_file_size(const unsigned int xid, struct cifs_tcon *tcon, 
	}



	return SMB2_set_eof(xid, tcon, cfile->fid.persistent_fid,

			    cfile->fid.volatile_fid, cfile->pid, &eof, false);

			    cfile->fid.volatile_fid, cfile->pid, &eof);

}



static int

fs/cifs/smb2pdu.c

+2 −7
Original line number Diff line number Diff line
@@ -3925,7 +3925,7 @@ SMB2_set_hardlink(const unsigned int xid, struct cifs_tcon *tcon, 


int

SMB2_set_eof(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid,

	     u64 volatile_fid, u32 pid, __le64 *eof, bool is_falloc)

	     u64 volatile_fid, u32 pid, __le64 *eof)

{

	struct smb2_file_eof_info info;

	void *data;
@@ -3936,11 +3936,6 @@ SMB2_set_eof(const unsigned int xid, struct cifs_tcon *tcon, u64 persistent_fid, 
	data = &info;

	size = sizeof(struct smb2_file_eof_info);



	if (is_falloc)

		return send_set_info(xid, tcon, persistent_fid, volatile_fid,

			pid, FILE_ALLOCATION_INFORMATION, SMB2_O_INFO_FILE,

			0, 1, &data, &size);

	else

	return send_set_info(xid, tcon, persistent_fid, volatile_fid,

			pid, FILE_END_OF_FILE_INFORMATION, SMB2_O_INFO_FILE,

			0, 1, &data, &size);

fs/cifs/smb2proto.h

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ extern int SMB2_set_hardlink(const unsigned int xid, struct cifs_tcon *tcon, 
			     __le16 *target_file);

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

			u64 persistent_fid, u64 volatile_fid, u32 pid,

			__le64 *eof, bool is_fallocate);

			__le64 *eof);

extern int SMB2_set_info_init(struct cifs_tcon *tcon, struct smb_rqst *rqst,

			      u64 persistent_fid, u64 volatile_fid, u32 pid,

			      u8 info_class, u8 info_type, u32 additional_info,

CRA Git | Maintained and supported by SUSTech CRA and CCSE