* [PATCH] block: fix busy device checking in blk_drop_partitions
@ 2020-04-04 6:51 Christoph Hellwig
2020-04-07 11:44 ` Christoph Hellwig
2020-04-07 20:43 ` Jens Axboe
0 siblings, 2 replies; 3+ messages in thread
From: Christoph Hellwig @ 2020-04-04 6:51 UTC (permalink / raw)
To: axboe, linux-block
bd_super is only set by get_tree_bdev and mount_bdev, and thus not by
other openers like btrfs or the XFS realtime and log devices, as well as
block devices directly opened from user space. Check bd_openers
instead.
Fixes: 77032ca66f86 ("Return EBUSY from BLKRRPART for mounted whole-dev fs")
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
block/partitions/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/block/partitions/core.c b/block/partitions/core.c
index b79c4513629b..1a0a829d8416 100644
--- a/block/partitions/core.c
+++ b/block/partitions/core.c
@@ -496,7 +496,7 @@ int blk_drop_partitions(struct gendisk *disk, struct block_device *bdev)
if (!disk_part_scan_enabled(disk))
return 0;
- if (bdev->bd_part_count || bdev->bd_super)
+ if (bdev->bd_part_count || bdev->bd_openers)
return -EBUSY;
res = invalidate_partition(disk, 0);
if (res)
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] block: fix busy device checking in blk_drop_partitions
2020-04-04 6:51 [PATCH] block: fix busy device checking in blk_drop_partitions Christoph Hellwig
@ 2020-04-07 11:44 ` Christoph Hellwig
2020-04-07 20:43 ` Jens Axboe
1 sibling, 0 replies; 3+ messages in thread
From: Christoph Hellwig @ 2020-04-07 11:44 UTC (permalink / raw)
To: axboe, linux-block
ping?
On Sat, Apr 04, 2020 at 08:51:20AM +0200, Christoph Hellwig wrote:
> bd_super is only set by get_tree_bdev and mount_bdev, and thus not by
> other openers like btrfs or the XFS realtime and log devices, as well as
> block devices directly opened from user space. Check bd_openers
> instead.
>
> Fixes: 77032ca66f86 ("Return EBUSY from BLKRRPART for mounted whole-dev fs")
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> block/partitions/core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/block/partitions/core.c b/block/partitions/core.c
> index b79c4513629b..1a0a829d8416 100644
> --- a/block/partitions/core.c
> +++ b/block/partitions/core.c
> @@ -496,7 +496,7 @@ int blk_drop_partitions(struct gendisk *disk, struct block_device *bdev)
>
> if (!disk_part_scan_enabled(disk))
> return 0;
> - if (bdev->bd_part_count || bdev->bd_super)
> + if (bdev->bd_part_count || bdev->bd_openers)
> return -EBUSY;
> res = invalidate_partition(disk, 0);
> if (res)
> --
> 2.25.1
---end quoted text---
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] block: fix busy device checking in blk_drop_partitions
2020-04-04 6:51 [PATCH] block: fix busy device checking in blk_drop_partitions Christoph Hellwig
2020-04-07 11:44 ` Christoph Hellwig
@ 2020-04-07 20:43 ` Jens Axboe
1 sibling, 0 replies; 3+ messages in thread
From: Jens Axboe @ 2020-04-07 20:43 UTC (permalink / raw)
To: Christoph Hellwig, linux-block
On 4/3/20 11:51 PM, Christoph Hellwig wrote:
> bd_super is only set by get_tree_bdev and mount_bdev, and thus not by
> other openers like btrfs or the XFS realtime and log devices, as well as
> block devices directly opened from user space. Check bd_openers
> instead.
Applied, thanks.
--
Jens Axboe
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-04-07 20:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-04 6:51 [PATCH] block: fix busy device checking in blk_drop_partitions Christoph Hellwig
2020-04-07 11:44 ` Christoph Hellwig
2020-04-07 20:43 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).