]> git.hungrycats.org Git - linux/commitdiff
Revert "vfs: verify source area in vfs_dedupe_file_range_one()"
authorZygo Blaxell <ce3g8jdj@umail.furryterror.org>
Thu, 9 Dec 2021 05:53:08 +0000 (00:53 -0500)
committerZygo Blaxell <ce3g8jdj@umail.furryterror.org>
Thu, 9 Dec 2021 05:53:08 +0000 (00:53 -0500)
This reverts commit 3078d85c9a1099405a0463c4d112ba97ee5bd217.

fs/remap_range.c

index 77dba3a49e658aa9c9484b9938cc3b81ac2de05f..e6099beefa97d6541e53177dcac22db6391de97b 100644 (file)
@@ -456,16 +456,8 @@ loff_t vfs_dedupe_file_range_one(struct file *src_file, loff_t src_pos,
        if (ret)
                return ret;
 
-       /*
-        * This is redundant if called from vfs_dedupe_file_range(), but other
-        * callers need it and it's not performance sesitive...
-        */
-       ret = remap_verify_area(src_file, src_pos, len, false);
-       if (ret)
-               goto out_drop_write;
-
        ret = remap_verify_area(dst_file, dst_pos, len, true);
-       if (ret)
+       if (ret < 0)
                goto out_drop_write;
 
        ret = -EPERM;