aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2006-06-26 03:27:25 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 12:58:35 -0400
commitf0b04115368ff383654a3bd26baf8f4be5e81132 (patch)
tree13429da63d6da393c30554d1483c3dac50e266bb
parent10da4f795f965f22039aa2930b6f80964aad3ee5 (diff)
[PATCH] dm: fix block device initialisation
In alloc_dev(), we register the device with the block layer and then continue to initialize the device. But register_disk() makes the device available to be opened before we have completed initialising it. This patch moves the final bits of the initialization above the disk registration. [akpm: too late for 2.6.17 - suitable for 2.6.17.x after it has settled] Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/md/dm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 29af584ae838..dfd037858902 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -891,6 +891,10 @@ static struct mapped_device *alloc_dev(unsigned int minor, int persistent)
891 if (!md->disk) 891 if (!md->disk)
892 goto bad4; 892 goto bad4;
893 893
894 atomic_set(&md->pending, 0);
895 init_waitqueue_head(&md->wait);
896 init_waitqueue_head(&md->eventq);
897
894 md->disk->major = _major; 898 md->disk->major = _major;
895 md->disk->first_minor = minor; 899 md->disk->first_minor = minor;
896 md->disk->fops = &dm_blk_dops; 900 md->disk->fops = &dm_blk_dops;
@@ -900,10 +904,6 @@ static struct mapped_device *alloc_dev(unsigned int minor, int persistent)
900 add_disk(md->disk); 904 add_disk(md->disk);
901 format_dev_t(md->name, MKDEV(_major, minor)); 905 format_dev_t(md->name, MKDEV(_major, minor));
902 906
903 atomic_set(&md->pending, 0);
904 init_waitqueue_head(&md->wait);
905 init_waitqueue_head(&md->eventq);
906
907 /* Populate the mapping, nobody knows we exist yet */ 907 /* Populate the mapping, nobody knows we exist yet */
908 spin_lock(&_minor_lock); 908 spin_lock(&_minor_lock);
909 old_md = idr_replace(&_minor_idr, md, minor); 909 old_md = idr_replace(&_minor_idr, md, minor);