aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2008-08-25 19:30:15 +0900
committerJens Axboe <jens.axboe@oracle.com>2008-10-09 08:56:04 +0200
commitec2cdedf798385a9397ac50dd0405dd658f8529c (patch)
treecd1c44d91a2baa4a56e0ca1ce6b854beb7cb3c39
parentdef4e38ddda9bef20b69bfa939195c2f79da7979 (diff)
downloadlinaro-lsk-ec2cdedf798385a9397ac50dd0405dd658f8529c.tar.gz
block: allow deleting zero length partition
delete_partition() was noop for zero length partition. As the addition code allows creating zero lenght partition and deletion is assumed to always succeed, this causes memory leak for zero length partitions. Allow zero length partitions to end their meaningless lives. While at it, allow deleting zero lenght partition via BLKPG_DEL_PARTITION ioctl too. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
-rw-r--r--block/ioctl.c2
-rw-r--r--fs/partitions/check.c2
2 files changed, 0 insertions, 4 deletions
diff --git a/block/ioctl.c b/block/ioctl.c
index 375c57922b0..c722de0ef2e 100644
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -68,8 +68,6 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user
case BLKPG_DEL_PARTITION:
if (!disk->part[part-1])
return -ENXIO;
- if (disk->part[part - 1]->nr_sects == 0)
- return -ENXIO;
bdevp = bdget_disk(disk, part);
if (!bdevp)
return -ENOMEM;
diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index ecc3330972e..68f3e41ae66 100644
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -325,8 +325,6 @@ void delete_partition(struct gendisk *disk, int part)
if (!p)
return;
- if (!p->nr_sects)
- return;
disk->part[part-1] = NULL;
p->start_sect = 0;
p->nr_sects = 0;