ksmbd: set the range of bytes to zero without extending file size in FSCTL_ZERO_DATA

namjaejeon · smfrench · commit 18e39fb960e6 · 2022-06-23T23:30:46.000-05:00
generic/091, 263 test failed since commit f66f8b9 ("cifs: when extending a file with falloc we should make files not-sparse"). FSCTL_ZERO_DATA sets the range of bytes to zero without extending file size. The VFS_FALLOCATE_FL_KEEP_SIZE flag should be used even on non-sparse files. Cc: stable@vger.kernel.org Reviewed-by: Hyunchul Lee <hyc.lee@gmail.com> Signed-off-by: Namjae Jeon <linkinjeon@kernel.org> Signed-off-by: Steve French <stfrench@microsoft.com>
diff --git a/fs/ksmbd/vfs.c b/fs/ksmbd/vfs.c
@@ -1015,7 +1015,9 @@ int ksmbd_vfs_zero_data(struct ksmbd_work *work, struct ksmbd_file *fp,
 				     FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
 				     off, len);
 
-	return vfs_fallocate(fp->filp, FALLOC_FL_ZERO_RANGE, off, len);
+	return vfs_fallocate(fp->filp,
+			     FALLOC_FL_ZERO_RANGE | FALLOC_FL_KEEP_SIZE,
+			     off, len);
 }
 
 int ksmbd_vfs_fqar_lseek(struct ksmbd_file *fp, loff_t start, loff_t length,

Original file line number	Diff line number	Diff line change
`@@ -1015,7 +1015,9 @@ int ksmbd_vfs_zero_data(struct ksmbd_work work, struct ksmbd_file fp,`
`1015`	`1015`	`FALLOC_FL_PUNCH_HOLE \| FALLOC_FL_KEEP_SIZE,`
`1016`	`1016`	`off, len);`
`1017`	`1017`
`1018`		`- return vfs_fallocate(fp->filp, FALLOC_FL_ZERO_RANGE, off, len);`
	`1018`	`+ return vfs_fallocate(fp->filp,`
	`1019`	`+ FALLOC_FL_ZERO_RANGE \| FALLOC_FL_KEEP_SIZE,`
	`1020`	`+ off, len);`
`1019`	`1021`	`}`
`1020`	`1022`
`1021`	`1023`	`int ksmbd_vfs_fqar_lseek(struct ksmbd_file *fp, loff_t start, loff_t length,`