Commit 0f472277 authored Mar 01, 2021 by Damien Le Moal Committed by Jens Axboe Feb 28, 2021

block: revert "block: fix bd_size_lock use"



With the removal of the skd driver, using IRQ safe locking of a bdev
bd_size_lock spinlock to protect the bdev inode size is not necessary
anymore as there is no other known driver using this lock under an IRQ
disabled context (e.g. calling set_capacity() with IRQ disabled).
Revert commit 0fe37724 ("block: fix bd_size_lock use") which
introduced the IRQ safe change.

Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent fe07bfda

block/genhd.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -45,11 +45,10 @@ static void disk_release_events(struct gendisk *disk);
		void set_capacity(struct gendisk *disk, sector_t sectors)
		{
		struct block_device *bdev = disk->part0;
		unsigned long flags;

		spin_lock_irqsave(&bdev->bd_size_lock, flags);
		spin_lock(&bdev->bd_size_lock);
		i_size_write(bdev->bd_inode, (loff_t)sectors << SECTOR_SHIFT);
		spin_unlock_irqrestore(&bdev->bd_size_lock, flags);
		spin_unlock(&bdev->bd_size_lock);
		}
		EXPORT_SYMBOL(set_capacity);

block/partitions/core.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -88,11 +88,9 @@ static int (check_part[])(struct parsed_partitions ) = {

		static void bdev_set_nr_sectors(struct block_device *bdev, sector_t sectors)
		{
		unsigned long flags;

		spin_lock_irqsave(&bdev->bd_size_lock, flags);
		spin_lock(&bdev->bd_size_lock);
		i_size_write(bdev->bd_inode, (loff_t)sectors << SECTOR_SHIFT);
		spin_unlock_irqrestore(&bdev->bd_size_lock, flags);
		spin_unlock(&bdev->bd_size_lock);
		}

		static struct parsed_partitions allocate_partitions(struct gendisk hd)