From aa0768508a2fe4977a93618f25ffe6ea8c867fa7 Mon Sep 17 00:00:00 2001 From: "Signed-off-by: Jan Kara" Date: Thu, 16 Sep 2010 20:36:36 +0200 Subject: [PATCH] --- yaml --- r: 213052 b: refs/heads/master c: 01ea50638bc04ca5259f5711fcdedefcdde1cf43 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/block/genhd.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9932271dec79..4e7d82237df7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2786c4e5e54802c34297e55050fef3e862a27b3f +refs/heads/master: 01ea50638bc04ca5259f5711fcdedefcdde1cf43 diff --git a/trunk/block/genhd.c b/trunk/block/genhd.c index 5c9c503de423..7923e720ddf5 100644 --- a/trunk/block/genhd.c +++ b/trunk/block/genhd.c @@ -541,13 +541,15 @@ void add_disk(struct gendisk *disk) disk->major = MAJOR(devt); disk->first_minor = MINOR(devt); + /* Register BDI before referencing it from bdev */ + bdi = &disk->queue->backing_dev_info; + bdi_register_dev(bdi, disk_devt(disk)); + blk_register_region(disk_devt(disk), disk->minors, NULL, exact_match, exact_lock, disk); register_disk(disk); blk_register_queue(disk); - bdi = &disk->queue->backing_dev_info; - bdi_register_dev(bdi, disk_devt(disk)); retval = sysfs_create_link(&disk_to_dev(disk)->kobj, &bdi->dev->kobj, "bdi"); WARN_ON(retval);