Commit 68e777e4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-6.0-2022-09-16' of git://git.kernel.dk/linux-block 

Pull block fixes from Jens Axboe:
 "Two fixes for -rc6:

   - Fix a mixup of sectors and bytes in the secure erase ioctl
     (Mikulas)

   - Fix for a bad return value for a non-blocking bio/blk queue enter
     call (me)"

* tag 'block-6.0-2022-09-16' of git://git.kernel.dk/linux-block:
  blk-lib: fix blkdev_issue_secure_erase
  block: blk_queue_enter() / __bio_queue_enter() must return -EAGAIN for nowait
parents 0158137d c4fa3684

block/blk-core.c

+2 −2
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ int blk_queue_enter(struct request_queue *q, blk_mq_req_flags_t flags) 


	while (!blk_try_enter_queue(q, pm)) {

		if (flags & BLK_MQ_REQ_NOWAIT)

			return -EBUSY;

			return -EAGAIN;



		/*

		 * read pair of barrier in blk_freeze_queue_start(), we need to
@@ -325,7 +325,7 @@ int __bio_queue_enter(struct request_queue *q, struct bio *bio) 
			if (test_bit(GD_DEAD, &disk->state))

				goto dead;

			bio_wouldblock_error(bio);

			return -EBUSY;

			return -EAGAIN;

		}



		/*

block/blk-lib.c

+8 −3
Original line number Diff line number Diff line
@@ -309,6 +309,11 @@ int blkdev_issue_secure_erase(struct block_device *bdev, sector_t sector, 
	struct blk_plug plug;

	int ret = 0;



	/* make sure that "len << SECTOR_SHIFT" doesn't overflow */

	if (max_sectors > UINT_MAX >> SECTOR_SHIFT)

		max_sectors = UINT_MAX >> SECTOR_SHIFT;

	max_sectors &= ~bs_mask;



	if (max_sectors == 0)

		return -EOPNOTSUPP;

	if ((sector | nr_sects) & bs_mask)
@@ -322,10 +327,10 @@ int blkdev_issue_secure_erase(struct block_device *bdev, sector_t sector, 


		bio = blk_next_bio(bio, bdev, 0, REQ_OP_SECURE_ERASE, gfp);

		bio->bi_iter.bi_sector = sector;

		bio->bi_iter.bi_size = len;

		bio->bi_iter.bi_size = len << SECTOR_SHIFT;



		sector += len << SECTOR_SHIFT;

		nr_sects -= len << SECTOR_SHIFT;

		sector += len;

		nr_sects -= len;

		if (!nr_sects) {

			ret = submit_bio_wait(bio);

			bio_put(bio);