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

Commit 469e3216 authored by Mike Christie's avatar Mike Christie Committed by Jens Axboe
Browse files

block discard: use bio set op accessor 



This converts the block issue discard helper and users to use
the bio_set_op_attrs accessor and only pass in the operation flags
like REQ_SEQURE.

Signed-off-by: default avatarMike Christie <mchristi@redhat.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 95fe6c1a

block/blk-lib.c

+7 −6
Original line number Original line Diff line number Diff line
@@ -23,7 +23,8 @@ static struct bio *next_bio(struct bio *bio, unsigned int nr_pages, 
}

}





int __blkdev_issue_discard(struct block_device *bdev, sector_t sector,

int __blkdev_issue_discard(struct block_device *bdev, sector_t sector,

		sector_t nr_sects, gfp_t gfp_mask, int type, struct bio **biop)

		sector_t nr_sects, gfp_t gfp_mask, int op_flags,

		struct bio **biop)

{

{

	struct request_queue *q = bdev_get_queue(bdev);

	struct request_queue *q = bdev_get_queue(bdev);

	struct bio *bio = *biop;

	struct bio *bio = *biop;
@@ -34,7 +35,7 @@ int __blkdev_issue_discard(struct block_device *bdev, sector_t sector, 
		return -ENXIO;

		return -ENXIO;

	if (!blk_queue_discard(q))

	if (!blk_queue_discard(q))

		return -EOPNOTSUPP;

		return -EOPNOTSUPP;

	if ((type & REQ_SECURE) && !blk_queue_secdiscard(q))

	if ((op_flags & REQ_SECURE) && !blk_queue_secdiscard(q))

		return -EOPNOTSUPP;

		return -EOPNOTSUPP;





	/* Zero-sector (unknown) and one-sector granularities are the same.  */

	/* Zero-sector (unknown) and one-sector granularities are the same.  */
@@ -65,7 +66,7 @@ int __blkdev_issue_discard(struct block_device *bdev, sector_t sector, 
		bio = next_bio(bio, 1, gfp_mask);

		bio = next_bio(bio, 1, gfp_mask);

		bio->bi_iter.bi_sector = sector;

		bio->bi_iter.bi_sector = sector;

		bio->bi_bdev = bdev;

		bio->bi_bdev = bdev;

		bio->bi_rw = type;

		bio_set_op_attrs(bio, REQ_OP_DISCARD, op_flags);





		bio->bi_iter.bi_size = req_sects << 9;

		bio->bi_iter.bi_size = req_sects << 9;

		nr_sects -= req_sects;

		nr_sects -= req_sects;
@@ -99,16 +100,16 @@ EXPORT_SYMBOL(__blkdev_issue_discard); 
int blkdev_issue_discard(struct block_device *bdev, sector_t sector,

int blkdev_issue_discard(struct block_device *bdev, sector_t sector,

		sector_t nr_sects, gfp_t gfp_mask, unsigned long flags)

		sector_t nr_sects, gfp_t gfp_mask, unsigned long flags)

{

{

	int type = REQ_WRITE | REQ_DISCARD;

	int op_flags = 0;

	struct bio *bio = NULL;

	struct bio *bio = NULL;

	struct blk_plug plug;

	struct blk_plug plug;

	int ret;

	int ret;





	if (flags & BLKDEV_DISCARD_SECURE)

	if (flags & BLKDEV_DISCARD_SECURE)

		type |= REQ_SECURE;

		op_flags |= REQ_SECURE;





	blk_start_plug(&plug);

	blk_start_plug(&plug);

	ret = __blkdev_issue_discard(bdev, sector, nr_sects, gfp_mask, type,

	ret = __blkdev_issue_discard(bdev, sector, nr_sects, gfp_mask, op_flags,

			&bio);

			&bio);

	if (!ret && bio) {

	if (!ret && bio) {

		ret = submit_bio_wait(bio);

		ret = submit_bio_wait(bio);

drivers/md/dm-thin.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -360,7 +360,7 @@ static int issue_discard(struct discard_op *op, dm_block_t data_b, dm_block_t da 
	sector_t len = block_to_sectors(tc->pool, data_e - data_b);

	sector_t len = block_to_sectors(tc->pool, data_e - data_b);





	return __blkdev_issue_discard(tc->pool_dev->bdev, s, len,

	return __blkdev_issue_discard(tc->pool_dev->bdev, s, len,

				      GFP_NOWAIT, REQ_WRITE | REQ_DISCARD, &op->bio);

				      GFP_NOWAIT, 0, &op->bio);

}

}





static void end_discard(struct discard_op *op, int r)

static void end_discard(struct discard_op *op, int r)

include/linux/blkdev.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -1149,7 +1149,8 @@ extern int blkdev_issue_flush(struct block_device *, gfp_t, sector_t *); 
extern int blkdev_issue_discard(struct block_device *bdev, sector_t sector,

extern int blkdev_issue_discard(struct block_device *bdev, sector_t sector,

		sector_t nr_sects, gfp_t gfp_mask, unsigned long flags);

		sector_t nr_sects, gfp_t gfp_mask, unsigned long flags);

extern int __blkdev_issue_discard(struct block_device *bdev, sector_t sector,

extern int __blkdev_issue_discard(struct block_device *bdev, sector_t sector,

		sector_t nr_sects, gfp_t gfp_mask, int type, struct bio **biop);

		sector_t nr_sects, gfp_t gfp_mask, int op_flags,

		struct bio **biop);

extern int blkdev_issue_write_same(struct block_device *bdev, sector_t sector,

extern int blkdev_issue_write_same(struct block_device *bdev, sector_t sector,

		sector_t nr_sects, gfp_t gfp_mask, struct page *page);

		sector_t nr_sects, gfp_t gfp_mask, struct page *page);

extern int blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,

extern int blkdev_issue_zeroout(struct block_device *bdev, sector_t sector,