diff options
| author | Li Lingfeng <lilingfeng3@huawei.com> | 2024-01-18 21:04:01 +0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2024-01-22 09:51:29 -0700 |
| commit | 7777f47f2ea64efd1016262e7b59fab34adfb869 (patch) | |
| tree | 7d2771ec325f962c74d8dd9bb695cecef30b85ef | |
| parent | 6613476e225e090cc9aad49be7fa504e290dd33d (diff) | |
| download | lwn-7777f47f2ea64efd1016262e7b59fab34adfb869.tar.gz lwn-7777f47f2ea64efd1016262e7b59fab34adfb869.zip | |
block: Move checking GENHD_FL_NO_PART to bdev_add_partition()
Commit 1a721de8489f ("block: don't add or resize partition on the disk
with GENHD_FL_NO_PART") prevented all operations about partitions on disks
with GENHD_FL_NO_PART in blkpg_do_ioctl() since they are meaningless.
However, it changed error code in some scenarios. So move checking
GENHD_FL_NO_PART to bdev_add_partition() to eliminate impact.
Fixes: 1a721de8489f ("block: don't add or resize partition on the disk with GENHD_FL_NO_PART")
Reported-by: Allison Karlitskaya <allison.karlitskaya@redhat.com>
Closes: https://lore.kernel.org/all/CAOYeF9VsmqKMcQjo1k6YkGNujwN-nzfxY17N3F-CMikE1tYp+w@mail.gmail.com/
Signed-off-by: Li Lingfeng <lilingfeng3@huawei.com>
Reviewed-by: Yu Kuai <yukuai3@huawei.com>
Link: https://lore.kernel.org/r/20240118130401.792757-1-lilingfeng@huaweicloud.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | block/ioctl.c | 2 | ||||
| -rw-r--r-- | block/partitions/core.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/block/ioctl.c b/block/ioctl.c index 9c73a763ef88..438f79c564cf 100644 --- a/block/ioctl.c +++ b/block/ioctl.c @@ -20,8 +20,6 @@ static int blkpg_do_ioctl(struct block_device *bdev, struct blkpg_partition p; sector_t start, length; - if (disk->flags & GENHD_FL_NO_PART) - return -EINVAL; if (!capable(CAP_SYS_ADMIN)) return -EACCES; if (copy_from_user(&p, upart, sizeof(struct blkpg_partition))) diff --git a/block/partitions/core.c b/block/partitions/core.c index cab0d76a828e..5f5ed5c75f04 100644 --- a/block/partitions/core.c +++ b/block/partitions/core.c @@ -439,6 +439,11 @@ int bdev_add_partition(struct gendisk *disk, int partno, sector_t start, goto out; } + if (disk->flags & GENHD_FL_NO_PART) { + ret = -EINVAL; + goto out; + } + if (partition_overlaps(disk, start, length, -1)) { ret = -EBUSY; goto out; |