Skip to contentSkip to conversation

Patch "cifs: Fix FALLOC_FL_ZERO_RANGE by setting i_size if EOF moved" has been added to the 6.6-stable tree

PATCH [email protected] 1 participant 1 message Dec 3, 2023

Subsystems (2)
lore
Share & tools
lore

[email protected]

author Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

cifs: Fix FALLOC_FL_ZERO_RANGE by setting i_size if EOF moved

to the 6.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
cifs-fix-falloc_fl_zero_range-by-setting-i_size-if-eof-moved.patch
and it can be found in the queue-6.6 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From 83d5518b124dfd605f10a68128482c839a239f9d Mon Sep 17 00:00:00 2001
From: David Howells <[email protected]>
Date: Wed, 29 Nov 2023 16:56:17 +0000
Subject: cifs: Fix FALLOC_FL_ZERO_RANGE by setting i_size if EOF moved

From: David Howells <[email protected]>

commit 83d5518b124dfd605f10a68128482c839a239f9d upstream.

Fix the cifs filesystem implementations of FALLOC_FL_ZERO_RANGE, in smb3_zero_range(), to set i_size after extending the file on the server.

Fixes 72c419d9b073 ("cifs: fix smb3_zero_range so it can expand the file-size when required")
cc Shyam Prasad N <[email protected]>
cc Rohith Surabattula <[email protected]>
cc Jeff Layton <[email protected]>
---
 fs/smb/client/smb2ops.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
fs/smb/client/smb2ops.c +8 -2
@@ -3305,6 +3305,7 @@ static long smb3_zero_range(struct file
 	struct inode *inode = file_inode(file);
 	struct cifsInodeInfo *cifsi = CIFS_I(inode);
 	struct cifsFileInfo *cfile = file->private_data;
+	unsigned long long new_size;
 	long rc;
 	unsigned int xid;
 	__le64 eof;
@@ -3335,10 +3336,15 @@ static long smb3_zero_range(struct file
 	/*
 	 * do we also need to change the size of the file?
 	 */
-	if (keep_size == false && i_size_read(inode) < offset + len) {
-		eof = cpu_to_le64(offset + len);
+	new_size = offset + len;
+	if (keep_size == false && (unsigned long long)i_size_read(inode) < new_size) {
+		eof = cpu_to_le64(new_size);
 		rc = SMB2_set_eof(xid, tcon, cfile->fid.persistent_fid,
 				  cfile->fid.volatile_fid, cfile->pid, &eof);
+		if (rc >= 0) {
+			truncate_setsize(inode, new_size);
+			fscache_resize_cookie(cifs_inode_cookie(inode), new_size);
+		}
 	}
 
  zero_range_exit:

Patches currently in stable-queue which might be from [email protected] are

queue-6.6/cifs-fix-falloc_fl_zero_range-by-setting-i_size-if-eof-moved.patch queue-6.6/cifs-fix-falloc_fl_insert_range-by-setting-i_size-after-eof-moved.patch