From: Tejun Heo Date: Fri, 29 Aug 2008 09:41:51 +0000 (+0200) Subject: block: don't test for partition size in bdget_disk() and blk_lookup_devt() X-Git-Tag: v2.6.28-rc1~733^2~60 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2bbedcb4c1abac498f18e5770d62ae66ff235ada;p=linux-2.6-omap-h63xx.git block: don't test for partition size in bdget_disk() and blk_lookup_devt() bdget_disk() and blk_lookup_devt() never cared whether the specified partition (or disk) is zero sized or not. I got confused while converting those not to depend on consecutive minor numbers in commit 5a6411b1178baf534aa9138052864dfa89d3eada and later when dev0 was added it broke callers which expected to get valid return for zero sized disk devices. So, they never needed nr_sects checks in the first place. Kill them. This problem was spotted and debugged by Bartlmoiej Zolnierkiewicz. Signed-off-by: Tejun Heo Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Jens Axboe --- diff --git a/block/genhd.c b/block/genhd.c index 32ee73c6756..ed926b760ca 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -584,7 +584,7 @@ struct block_device *bdget_disk(struct gendisk *disk, int partno) struct block_device *bdev = NULL; part = disk_get_part(disk, partno); - if (part && (part->nr_sects || partno == 0)) + if (part) bdev = bdget(part_devt(part)); disk_put_part(part); @@ -1031,7 +1031,7 @@ dev_t blk_lookup_devt(const char *name, int partno) continue; part = disk_get_part(disk, partno); - if (part && (part->nr_sects || partno == 0)) { + if (part) { devt = part_devt(part); disk_put_part(part); break;