diff options
author | Christoph Hellwig <hch@lst.de> | 2021-04-21 19:05:02 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-28 14:39:59 +0300 |
commit | fc2454cc0c4bbf3ab7556c8b38e042c6c7651e42 (patch) | |
tree | 36a91c5ea86ed8883b05d68395c2f1cc35b76beb /block | |
parent | 2bbd8aafde362e2d2bb3af3ce2ea400c3860073f (diff) | |
download | linux-fc2454cc0c4bbf3ab7556c8b38e042c6c7651e42.tar.xz |
block: return -EBUSY when there are open partitions in blkdev_reread_part
[ Upstream commit 68e6582e8f2dc32fd2458b9926564faa1fb4560e ]
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: 4601b4b130de ("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>
Diffstat (limited to 'block')
-rw-r--r-- | block/ioctl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/block/ioctl.c b/block/ioctl.c index 3be4d0e2a96c..ed240e170e14 100644 --- a/block/ioctl.c +++ b/block/ioctl.c @@ -98,6 +98,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 |