cifs: only write 64kb at a time when fallocating a small region of a file
Subsystems (2)
PATCH 1/1 cifs: only write 64kb at a time when fallocating a small region of a file
We only allow sending single credit writes through the SMB2_write() synchronous api so split this into smaller chunks.
Fixes 966a3cb7c7db ("cifs: improve fallocate emulation")
Signed-off-by Ronnie Sahlberg <[email protected]>
--- fs/cifs/smb2ops.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-)
fs/cifs/smb2ops.c +19 -12
@@ -3617,7 +3617,7 @@ static int smb3_simple_fallocate_write_range(unsigned int xid, char *buf) {struct cifs_io_parms io_parms = {0 }; -int nbytes; +int rc, nbytes;struct kvec iov[2 ]; io_parms.netfid = cfile->fid.netfid;
@@ -3625,13 +3625,25 @@ static int smb3_simple_fallocate_write_range(unsigned int xid, io_parms.tcon = tcon; io_parms.persistent_fid = cfile->fid.persistent_fid; io_parms.volatile_fid = cfile->fid.volatile_fid; - io_parms.offset = off; - io_parms.length = len; -/* iov[0] is reserved for smb header */ - iov[1 ].iov_base = buf; - iov[1 ].iov_len = io_parms.length; -return SMB2_write (xid, &io_parms, &nbytes, iov,1 ); +while (len) { + io_parms.offset = off; + io_parms.length = len; +if (io_parms.length >65536 ) + io_parms.length =65536 ; +/* iov[0] is reserved for smb header */ + iov[1 ].iov_base = buf; + iov[1 ].iov_len = io_parms.length; + rc =SMB2_write (xid, &io_parms, &nbytes, iov,1 ); +if (rc) +break ; +if (nbytes > len) +return -EINVAL ; + buf += nbytes; + off += nbytes; + len -= nbytes; + } +return rc; } static int smb3_simple_fallocate_range(unsigned int xid,
@@ -3655,11 +3667,6 @@ static int smb3_simple_fallocate_range(unsigned int xid, (char **)&out_data, &out_data_len);if (rc) goto out; -/* -* It is already all allocated -*/ -if (out_data_len ==0 ) - goto out; buf =kzalloc (1024 *1024 ,GFP_KERNEL );if (buf ==NULL ) {
Signature · 1 line
2.30.2