Skip to content

Commit acc91c2

Browse files
z00467499smfrench
authored andcommitted
cifs/smb3: Fix data inconsistent when punch hole
When punch hole success, we also can read old data from file: # strace -e trace=pread64,fallocate xfs_io -f -c "pread 20 40" \ -c "fpunch 20 40" -c"pread 20 40" file pread64(3, " version 5.8.0-rc1+"..., 40, 20) = 40 fallocate(3, FALLOC_FL_KEEP_SIZE|FALLOC_FL_PUNCH_HOLE, 20, 40) = 0 pread64(3, " version 5.8.0-rc1+"..., 40, 20) = 40 CIFS implements the fallocate(FALLOCATE_FL_PUNCH_HOLE) with send SMB ioctl(FSCTL_SET_ZERO_DATA) to server. It just set the range of the remote file to zero, but local page caches not updated, then the local page caches inconsistent with server. Also can be found by xfstests generic/316. So, we need to remove the page caches before send the SMB ioctl(FSCTL_SET_ZERO_DATA) to server. Fixes: 31742c5 ("enable fallocate punch hole ("fallocate -p") for SMB3") Suggested-by: Pavel Shilovsky <[email protected]> Reviewed-by: Pavel Shilovsky <[email protected]> Signed-off-by: Zhang Xiaoxu <[email protected]> Cc: [email protected] # v3.17 Signed-off-by: Steve French <[email protected]>
1 parent 6b69040 commit acc91c2

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

fs/cifs/smb2ops.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3259,6 +3259,12 @@ static long smb3_punch_hole(struct file *file, struct cifs_tcon *tcon,
32593259
return rc;
32603260
}
32613261

3262+
/*
3263+
* We implement the punch hole through ioctl, so we need remove the page
3264+
* caches first, otherwise the data may be inconsistent with the server.
3265+
*/
3266+
truncate_pagecache_range(inode, offset, offset + len - 1);
3267+
32623268
cifs_dbg(FYI, "Offset %lld len %lld\n", offset, len);
32633269

32643270
fsctl_buf.FileOffset = cpu_to_le64(offset);

0 commit comments

Comments
 (0)