From cac0a67a2b6cc6f39f31d49a45c0dddb73efd787 Mon Sep 17 00:00:00 2001 From: Namhyung Kim Date: Thu, 26 May 2011 21:06:50 +0200 Subject: [PATCH] --- yaml --- r: 252251 b: refs/heads/master c: af46566885a373b0a526932484cd8fef8de7b598 h: refs/heads/master i: 252249: 73d3fb4b057db1534f26cbff5e767cfa35ad6be7 252247: bf8ec318dcc95c4f416810902043660823afa019 v: v3 --- [refs] | 2 +- trunk/drivers/block/brd.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 61587f0c999d..653963bed02e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 315980c8688c4b06713c1a5fe9d64cdf8ab57a72 +refs/heads/master: af46566885a373b0a526932484cd8fef8de7b598 diff --git a/trunk/drivers/block/brd.c b/trunk/drivers/block/brd.c index e9a19d99f928..b1efa8f9ff42 100644 --- a/trunk/drivers/block/brd.c +++ b/trunk/drivers/block/brd.c @@ -548,7 +548,7 @@ static struct kobject *brd_probe(dev_t dev, int *part, void *data) struct kobject *kobj; mutex_lock(&brd_devices_mutex); - brd = brd_init_one(dev & MINORMASK); + brd = brd_init_one(MINOR(dev) >> part_shift); kobj = brd ? get_disk(brd->brd_disk) : ERR_PTR(-ENOMEM); mutex_unlock(&brd_devices_mutex); @@ -589,10 +589,10 @@ static int __init brd_init(void) if (rd_nr) { nr = rd_nr; - range = rd_nr; + range = rd_nr << part_shift; } else { nr = CONFIG_BLK_DEV_RAM_COUNT; - range = 1UL << (MINORBITS - part_shift); + range = 1UL << MINORBITS; } if (register_blkdev(RAMDISK_MAJOR, "ramdisk")) @@ -631,7 +631,7 @@ static void __exit brd_exit(void) unsigned long range; struct brd_device *brd, *next; - range = rd_nr ? rd_nr : 1UL << (MINORBITS - part_shift); + range = rd_nr ? rd_nr << part_shift : 1UL << MINORBITS; list_for_each_entry_safe(brd, next, &brd_devices, brd_list) brd_del_one(brd);