[RFC PATCH v4 09/11] block: factor out common part in blkdev_fallocate()

[Zhang Yi]

From: Zhang Yi <yi.zh...@huawei.com>

Only the flags passed to blkdev_issue_zeroout() differ among the two
zeroing branches in blkdev_fallocate(). Therefore, do cleanup by
factoring them out.

Signed-off-by: Zhang Yi <yi.zh...@huawei.com>
Reviewed-by: Christoph Hellwig <h...@lst.de>
---
 block/fops.c | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/block/fops.c b/block/fops.c
index be9f1dbea9ce..77a5465309e7 100644
--- a/block/fops.c
+++ b/block/fops.c
@@ -812,6 +812,7 @@ static long blkdev_fallocate(struct file *file, int mode, 
loff_t start,
        struct block_device *bdev = I_BDEV(inode);
        loff_t end = start + len - 1;
        loff_t isize;
+       unsigned int flags;
        int error;
 
        /* Fail if we don't recognize the flags. */
@@ -838,34 +839,29 @@ 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, 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);
+               flags = 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);
+               flags = BLKDEV_ZERO_NOFALLBACK;
                break;
        default:
                error = -EOPNOTSUPP;
+               goto fail;
        }
 
+       /*
+        * Invalidate the page cache, including dirty pages, for valid
+        * de-allocate mode calls to fallocate().
+        */
+       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, flags);
  fail:
        filemap_invalidate_unlock(inode->i_mapping);
        return error;
-- 
2.46.1