diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-25 22:33:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-25 22:33:10 -0700 |
| commit | c13320499ba0efd93174ef6462ae8a7a2933f6e7 (patch) | |
| tree | 5a49e9d578be46c879831dc7c325f408c33e6fc9 /fs/smb/client/smb2ops.c | |
| parent | 9b62e02e63363f5678d5598ee7372064301587f7 (diff) | |
| parent | 93a43155127fec0f8cc942d63b76668c2f8f69fa (diff) | |
| download | linux-c13320499ba0efd93174ef6462ae8a7a2933f6e7.tar.gz linux-c13320499ba0efd93174ef6462ae8a7a2933f6e7.tar.bz2 linux-c13320499ba0efd93174ef6462ae8a7a2933f6e7.zip | |
Merge tag '6.10-rc-smb3-fixes-part2' of git://git.samba.org/sfrench/cifs-2.6
Pull smb client fixes from Steve French:
- two important netfs integration fixes - including for a data
corruption and also fixes for multiple xfstests
- reenable swap support over SMB3
* tag '6.10-rc-smb3-fixes-part2' of git://git.samba.org/sfrench/cifs-2.6:
cifs: Fix missing set of remote_i_size
cifs: Fix smb3_insert_range() to move the zero_point
cifs: update internal version number
smb3: reenable swapfiles over SMB3 mounts
Diffstat (limited to 'fs/smb/client/smb2ops.c')
| -rw-r--r-- | fs/smb/client/smb2ops.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/smb/client/smb2ops.c b/fs/smb/client/smb2ops.c index ef18cd30f66c..4ce6c3121a7e 100644 --- a/fs/smb/client/smb2ops.c +++ b/fs/smb/client/smb2ops.c @@ -2028,6 +2028,7 @@ smb2_duplicate_extents(const unsigned int xid, * size will be queried on next revalidate, but it is important * to make sure that file's cached size is updated immediately */ + netfs_resize_file(netfs_inode(inode), dest_off + len, true); cifs_setsize(inode, dest_off + len); } rc = SMB2_ioctl(xid, tcon, trgtfile->fid.persistent_fid, @@ -3636,6 +3637,7 @@ static long smb3_insert_range(struct file *file, struct cifs_tcon *tcon, rc = smb2_copychunk_range(xid, cfile, cfile, off, count, off + len); if (rc < 0) goto out_2; + cifsi->netfs.zero_point = new_eof; rc = smb3_zero_data(file, tcon, off, len, xid); if (rc < 0) |