ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'vfs-6.2-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

Browse Source 
Pull vfs remap_range update from Darrick Wong:

 - Make some minor adjustments to the remap range preparation function
   to skip file updates when the request length is adjusted downwards to
   zero.

* tag 'vfs-6.2-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  fs/remap_range: avoid spurious writeback on zero length request
This commit is contained in:
Linus Torvalds
2022-12-13 10:26:38 -08:00
parent 02bf43c7b7 a79168a0c0
commit a45a7db9bc
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fs/remap_range.c
View File

@@ -304,7 +304,7 @@ __generic_remap_file_range_prep(struct file *file_in, loff_t pos_in,
/* Check that we don't violate system file offset limits. */ /* Check that we don't violate system file offset limits. */
ret = generic_remap_checks(file_in, pos_in, file_out, pos_out, len, ret = generic_remap_checks(file_in, pos_in, file_out, pos_out, len,
remap_flags); remap_flags);
if (ret) if (ret || *len == 0)
return ret; return ret;
/* Wait for the completion of any pending IOs on both files */ /* Wait for the completion of any pending IOs on both files */
@@ -328,9 +328,6 @@ __generic_remap_file_range_prep(struct file *file_in, loff_t pos_in,
if (remap_flags & REMAP_FILE_DEDUP) { if (remap_flags & REMAP_FILE_DEDUP) {
bool is_same = false; bool is_same = false;
if (*len == 0)
return 0;
if (!IS_DAX(inode_in)) if (!IS_DAX(inode_in))
ret = vfs_dedupe_file_range_compare(file_in, pos_in, ret = vfs_dedupe_file_range_compare(file_in, pos_in,
file_out, pos_out, *len, &is_same); file_out, pos_out, *len, &is_same);
@@ -348,7 +345,7 @@ __generic_remap_file_range_prep(struct file *file_in, loff_t pos_in,
ret = generic_remap_check_len(inode_in, inode_out, pos_out, len, ret = generic_remap_check_len(inode_in, inode_out, pos_out, len,
remap_flags); remap_flags);
if (ret) if (ret || *len == 0)
return ret; return ret;
/* If can't alter the file contents, we're done. */ /* If can't alter the file contents, we're done. */