---

yaml --- r: 110471 b: refs/heads/master c: ec2cded h: refs/heads/master i: 110469: 6737f7b 110467: b903ecd 110463: f3d548a v: v3
git-mirror · Oct 9, 2008 · 6eafd2f · 6eafd2f
1 parent ea4dc80
commit 6eafd2f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: def4e38ddda9bef20b69bfa939195c2f79da7979
+refs/heads/master: ec2cdedf798385a9397ac50dd0405dd658f8529c
diff --git a/trunk/block/ioctl.c b/trunk/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/trunk/fs/partitions/check.c b/trunk/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;