Merge tag 'mtd/fixes-for-6.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git...

[platform/kernel/linux-rpi.git] / block / fops.c

diff --git a/block/fops.c b/block/fops.c
index a24a624..73e4274 100644 (file)
--- a/block/fops.c
+++ b/block/fops.c
@@ -671,10 +671,6 @@ static ssize_t blkdev_write_iter(struct kiocb *iocb, struct iov_iter *from)
                iov_iter_truncate(from, size);
        }
 
-       ret = file_remove_privs(file);
-       if (ret)
-               return ret;
-
        ret = file_update_time(file);
        if (ret)
                return ret;
@@ -776,24 +772,35 @@ static long blkdev_fallocate(struct file *file, int mode, loff_t start,
 
        filemap_invalidate_lock(inode->i_mapping);
 
-       /* Invalidate the page cache, including dirty pages. */
-       error = truncate_bdev_range(bdev, file_to_blk_mode(file), start, end);
-       if (error)
-               goto fail;
-
+       /*
+        * Invalidate the page cache, including dirty pages, for valid
+        * de-allocate mode calls to fallocate().
+        */
        switch (mode) {
        case FALLOC_FL_ZERO_RANGE:
        case FALLOC_FL_ZERO_RANGE | FALLOC_FL_KEEP_SIZE:
+               error = truncate_bdev_range(bdev, file_to_blk_mode(file), start, end);
+               if (error)
+                       goto fail;
+
                error = blkdev_issue_zeroout(bdev, start >> SECTOR_SHIFT,
                                             len >> SECTOR_SHIFT, GFP_KERNEL,
                                             BLKDEV_ZERO_NOUNMAP);
                break;
        case FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE:
+               error = truncate_bdev_range(bdev, file_to_blk_mode(file), start, end);
+               if (error)
+                       goto fail;
+
                error = blkdev_issue_zeroout(bdev, start >> SECTOR_SHIFT,
                                             len >> SECTOR_SHIFT, GFP_KERNEL,
                                             BLKDEV_ZERO_NOFALLBACK);
                break;
        case FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE | FALLOC_FL_NO_HIDE_STALE:
+               error = truncate_bdev_range(bdev, file_to_blk_mode(file), start, end);
+               if (error)
+                       goto fail;
+
                error = blkdev_issue_discard(bdev, start >> SECTOR_SHIFT,
                                             len >> SECTOR_SHIFT, GFP_KERNEL);
                break;