block: add a flags argument to (__)blkdev_issue_zeroout

Turn the existing discard flag into a new BLKDEV_ZERO_UNMAP flag with
similar semantics, but without referring to diѕcard.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Jens Axboe <axboe@fb.com>

3 files changed, 3 insertions, 3 deletions

diff --git a/fs/block_dev.c b/fs/block_dev.c
index f2d59f143ef4..2f704c3a816f 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -2105,7 +2105,7 @@ static long blkdev_fallocate(struct file *file, int mode, loff_t start,
         case FALLOC_FL_ZERO_RANGE:
         case FALLOC_FL_ZERO_RANGE | FALLOC_FL_KEEP_SIZE:
                 error = blkdev_issue_zeroout(bdev, start >> 9, len >> 9,
-                                            GFP_KERNEL, false);
+                                            GFP_KERNEL, BLKDEV_ZERO_NOUNMAP);
                 break;
         case FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE:
                 /* Only punch if the device can do zeroing discard. */
diff --git a/fs/dax.c b/fs/dax.c
index de622d4282a6..2bfbcd726047 100644
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -982,7 +982,7 @@ int __dax_zero_page_range(struct block_device *bdev, sector_t sector,
                 sector_t start_sector = dax.sector + (offset >> 9);
 
                 return blkdev_issue_zeroout(bdev, start_sector,
-                                length >> 9, GFP_NOFS, true);
+                                length >> 9, GFP_NOFS, 0);
         } else {
                 if (dax_map_atomic(bdev, &dax) < 0)
                         return PTR_ERR(dax.addr);
diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
index 8b75dcea5966..142bbbe06114 100644
--- a/fs/xfs/xfs_bmap_util.c
+++ b/fs/xfs/xfs_bmap_util.c
@@ -81,7 +81,7 @@ xfs_zero_extent(
         return blkdev_issue_zeroout(xfs_find_bdev_for_inode(VFS_I(ip)),
                 block << (mp->m_super->s_blocksize_bits - 9),
                 count_fsb << (mp->m_super->s_blocksize_bits - 9),
-                GFP_NOFS, true);
+                GFP_NOFS, 0);
 }
 
 int