Commit 977b1ef5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-6.9-20240420' of git://git.kernel.dk/linux 

Pull block fixes from Jens Axboe:
 "Just two minor fixes that should go into the 6.9 kernel release, one
  fixing a regression with partition scanning errors, and one fixing a
  WARN_ON() that can get triggered if we race with a timer"

* tag 'block-6.9-20240420' of git://git.kernel.dk/linux:
  blk-iocost: do not WARN if iocg was already offlined
  block: propagate partition scanning errors to the BLKRRPART ioctl
parents 39316e5f 01bc4fda

block/bdev.c

+19 −10
Original line number Diff line number Diff line
@@ -645,6 +645,14 @@ static void blkdev_flush_mapping(struct block_device *bdev) 
	bdev_write_inode(bdev);

}



static void blkdev_put_whole(struct block_device *bdev)

{

	if (atomic_dec_and_test(&bdev->bd_openers))

		blkdev_flush_mapping(bdev);

	if (bdev->bd_disk->fops->release)

		bdev->bd_disk->fops->release(bdev->bd_disk);

}



static int blkdev_get_whole(struct block_device *bdev, blk_mode_t mode)

{

	struct gendisk *disk = bdev->bd_disk;
@@ -663,18 +671,19 @@ static int blkdev_get_whole(struct block_device *bdev, blk_mode_t mode) 


	if (!atomic_read(&bdev->bd_openers))

		set_init_blocksize(bdev);

	if (test_bit(GD_NEED_PART_SCAN, &disk->state))

		bdev_disk_changed(disk, false);

	atomic_inc(&bdev->bd_openers);

	return 0;

	if (test_bit(GD_NEED_PART_SCAN, &disk->state)) {

		/*

		 * Only return scanning errors if we are called from contexts

		 * that explicitly want them, e.g. the BLKRRPART ioctl.

		 */

		ret = bdev_disk_changed(disk, false);

		if (ret && (mode & BLK_OPEN_STRICT_SCAN)) {

			blkdev_put_whole(bdev);

			return ret;

		}



static void blkdev_put_whole(struct block_device *bdev)

{

	if (atomic_dec_and_test(&bdev->bd_openers))

		blkdev_flush_mapping(bdev);

	if (bdev->bd_disk->fops->release)

		bdev->bd_disk->fops->release(bdev->bd_disk);

	}

	return 0;

}



static int blkdev_get_part(struct block_device *part, blk_mode_t mode)

block/blk-iocost.c

+5 −2
Original line number Diff line number Diff line
@@ -1439,8 +1439,11 @@ static void iocg_pay_debt(struct ioc_gq *iocg, u64 abs_vpay, 
	lockdep_assert_held(&iocg->ioc->lock);

	lockdep_assert_held(&iocg->waitq.lock);



	/* make sure that nobody messed with @iocg */

	WARN_ON_ONCE(list_empty(&iocg->active_list));

	/*

	 * make sure that nobody messed with @iocg. Check iocg->pd.online

	 * to avoid warn when removing blkcg or disk.

	 */

	WARN_ON_ONCE(list_empty(&iocg->active_list) && iocg->pd.online);

	WARN_ON_ONCE(iocg->inuse > 1);



	iocg->abs_vdebt -= min(abs_vpay, iocg->abs_vdebt);

block/ioctl.c

+2 −1
Original line number Diff line number Diff line
@@ -563,7 +563,8 @@ static int blkdev_common_ioctl(struct block_device *bdev, blk_mode_t mode, 
			return -EACCES;

		if (bdev_is_partition(bdev))

			return -EINVAL;

		return disk_scan_partitions(bdev->bd_disk, mode);

		return disk_scan_partitions(bdev->bd_disk,

				mode | BLK_OPEN_STRICT_SCAN);

	case BLKTRACESTART:

	case BLKTRACESTOP:

	case BLKTRACETEARDOWN:

include/linux/blkdev.h

+2 −0
Original line number Diff line number Diff line
@@ -128,6 +128,8 @@ typedef unsigned int __bitwise blk_mode_t; 
#define BLK_OPEN_WRITE_IOCTL	((__force blk_mode_t)(1 << 4))

/* open is exclusive wrt all other BLK_OPEN_WRITE opens to the device */

#define BLK_OPEN_RESTRICT_WRITES	((__force blk_mode_t)(1 << 5))

/* return partition scanning errors */

#define BLK_OPEN_STRICT_SCAN	((__force blk_mode_t)(1 << 6))



struct gendisk {

	/*