Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb365b96 authored Apr 05, 2017 by Christoph Hellwig Committed by Jens Axboe Apr 08, 2017

block: add a new BLKDEV_ZERO_NOFALLBACK flag



This avoids fallbacks to explicit zeroing in (__)blkdev_issue_zeroout if
the caller doesn't want them.

Also clean up the convoluted check for the return condition that this
new flag is added to.

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>

parent d928be9f

block/blk-lib.c

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -281,6 +281,9 @@ static int __blkdev_issue_write_zeroes(struct block_device *bdev,
	*		*
	* If a device is using logical block provisioning, the underlying space will		* If a device is using logical block provisioning, the underlying space will
	* not be released if %flags contains BLKDEV_ZERO_NOUNMAP.		* not be released if %flags contains BLKDEV_ZERO_NOUNMAP.
			*
			* If %flags contains BLKDEV_ZERO_NOFALLBACK, the function will return
			* -EOPNOTSUPP if no explicit hardware offload for zeroing is provided.
	*/		*/
	int __blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,		int __blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,
	sector_t nr_sects, gfp_t gfp_mask, struct bio **biop,		sector_t nr_sects, gfp_t gfp_mask, struct bio **biop,
	@@ -298,7 +301,7 @@ int __blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,

	ret = __blkdev_issue_write_zeroes(bdev, sector, nr_sects, gfp_mask,		ret = __blkdev_issue_write_zeroes(bdev, sector, nr_sects, gfp_mask,
	biop, flags);		biop, flags);
	if (ret == 0 \|\| (ret && ret != -EOPNOTSUPP))		if (ret != -EOPNOTSUPP \|\| (flags & BLKDEV_ZERO_NOFALLBACK))
	goto out;		goto out;

	ret = 0;		ret = 0;

include/linux/blkdev.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1350,6 +1350,7 @@ extern int __blkdev_issue_discard(struct block_device *bdev, sector_t sector,
	struct bio **biop);		struct bio **biop);

	#define BLKDEV_ZERO_NOUNMAP (1 << 0) /* do not free blocks */		#define BLKDEV_ZERO_NOUNMAP (1 << 0) /* do not free blocks */
			#define BLKDEV_ZERO_NOFALLBACK (1 << 1) /* don't write explicit zeroes */

	extern int __blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,		extern int __blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,
	sector_t nr_sects, gfp_t gfp_mask, struct bio **biop,		sector_t nr_sects, gfp_t gfp_mask, struct bio **biop,