Skip to content

Commit

Permalink
block: return -EBUSY when there are open partitions in blkdev_reread_…
Browse files Browse the repository at this point in the history
…part

[ Upstream commit 68e6582 ]

The switch to go through blkdev_get_by_dev means we now ignore the
return value from bdev_disk_changed in __blkdev_get.  Add a manual
check to restore the old semantics.

Fixes: 4601b4b ("block: reopen the device in blkdev_reread_part")
Reported-by: Karel Zak <kzak@redhat.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20210421160502.447418-1-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Christoph Hellwig authored and gregkh committed Apr 28, 2021
1 parent 2bb0a48 commit 785bdb3
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions block/ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ static int blkdev_reread_part(struct block_device *bdev, fmode_t mode)
return -EINVAL;
if (!capable(CAP_SYS_ADMIN))
return -EACCES;
if (bdev->bd_part_count)
return -EBUSY;

/*
* Reopen the device to revalidate the driver state and force a
Expand Down

0 comments on commit 785bdb3

Please sign in to comment.