From 6eafd2fbf22cdb0df51da3d6d8cff6c3046e8a2f Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Mon, 25 Aug 2008 19:30:15 +0900
Subject: [PATCH] --- yaml --- r: 110471 b: refs/heads/master c:
 ec2cdedf798385a9397ac50dd0405dd658f8529c h: refs/heads/master i:   110469:
 6737f7bb2dc873411101941da001d201b3f40baf   110467:
 b903ecd7d3ce43d445374eb9e3534960b2bfe22a   110463:
 f3d548a7627b80a2951223896477d601185589da v: v3

---
 [refs]                      | 2 +-
 trunk/block/ioctl.c         | 2 --
 trunk/fs/partitions/check.c | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 7abe71353774..e7c1ae286a67 100644
--- 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
index 375c57922b00..c722de0ef2ee 100644
--- 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
index ecc3330972e5..68f3e41ae66f 100644
--- 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;