From: Christoph Hellwig Date: Thu, 1 Jun 2023 09:44:49 +0000 (+0200) Subject: block: unhash the inode earlier in delete_partition X-Git-Tag: v6.5-rc1~114^2~137 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=69f90b70bdb62e1a930239d33579e04884cd0b9a;p=thirdparty%2Flinux.git block: unhash the inode earlier in delete_partition Move the call to remove_inode_hash to the beginning of delete_partition, as we want to prevent opening a block_device that is about to be removed ASAP. Signed-off-by: Christoph Hellwig Reviewed-by: Jan Kara Acked-by: Dave Chinner Reviewed-by: Dave Chinner Link: https://lore.kernel.org/r/20230601094459.1350643-7-hch@lst.de Signed-off-by: Jens Axboe --- diff --git a/block/partitions/core.c b/block/partitions/core.c index 82d26427deae2..9d1debaa5caf9 100644 --- a/block/partitions/core.c +++ b/block/partitions/core.c @@ -267,6 +267,12 @@ static void delete_partition(struct block_device *part) { lockdep_assert_held(&part->bd_disk->open_mutex); + /* + * Remove the block device from the inode hash, so that it cannot be + * looked up any more even when openers still hold references. + */ + remove_inode_hash(part->bd_inode); + fsync_bdev(part); __invalidate_device(part, true); @@ -274,12 +280,6 @@ static void delete_partition(struct block_device *part) kobject_put(part->bd_holder_dir); device_del(&part->bd_device); - /* - * Remove the block device from the inode hash, so that it cannot be - * looked up any more even when openers still hold references. - */ - remove_inode_hash(part->bd_inode); - put_device(&part->bd_device); }