diff options
| author | Christoph Hellwig <hch@lst.de> | 2017-04-05 19:21:11 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-04-08 11:25:38 -0600 |
| commit | 34045129b128fb3c0237b6af7c5a84b1ca9c0bf5 (patch) | |
| tree | a85625b4c9d3f7a4eefd151e0ec14c7e17658dd9 /fs | |
| parent | cb365b9675fda026caba4cb5df83292cb7c0811a (diff) | |
| download | linux-34045129b128fb3c0237b6af7c5a84b1ca9c0bf5.tar.gz linux-34045129b128fb3c0237b6af7c5a84b1ca9c0bf5.tar.bz2 linux-34045129b128fb3c0237b6af7c5a84b1ca9c0bf5.zip | |
block_dev: use blkdev_issue_zerout for hole punches
This gets us support for non-discard efficient write of zeroes (e.g. NVMe)
and prepares for removing the discard_zeroes_data flag.
Also remove a pointless discard support check, which is done in
blkdev_issue_discard already.
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/block_dev.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c index 2f704c3a816f..e405d8e58e31 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -2069,7 +2069,6 @@ static long blkdev_fallocate(struct file *file, int mode, loff_t start, loff_t len) { struct block_device *bdev = I_BDEV(bdev_file_inode(file)); - struct request_queue *q = bdev_get_queue(bdev); struct address_space *mapping; loff_t end = start + len - 1; loff_t isize; @@ -2108,15 +2107,10 @@ static long blkdev_fallocate(struct file *file, int mode, loff_t start, GFP_KERNEL, BLKDEV_ZERO_NOUNMAP); break; case FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE: - /* Only punch if the device can do zeroing discard. */ - if (!blk_queue_discard(q) || !q->limits.discard_zeroes_data) - return -EOPNOTSUPP; - error = blkdev_issue_discard(bdev, start >> 9, len >> 9, - GFP_KERNEL, 0); + error = blkdev_issue_zeroout(bdev, start >> 9, len >> 9, + GFP_KERNEL, BLKDEV_ZERO_NOFALLBACK); break; case FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE | FALLOC_FL_NO_HIDE_STALE: - if (!blk_queue_discard(q)) - return -EOPNOTSUPP; error = blkdev_issue_discard(bdev, start >> 9, len >> 9, GFP_KERNEL, 0); break; |