diff options
| author | Jeff Mahoney | 2006-06-26 09:27:25 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2006-06-26 18:58:35 +0200 |
| commit | f0b04115368ff383654a3bd26baf8f4be5e81132 (patch) | |
| tree | 13429da63d6da393c30554d1483c3dac50e266bb /drivers/md/dm.c | |
| parent | [PATCH] dm: add module ref counting (diff) | |
| download | kernel-qcow2-linux-f0b04115368ff383654a3bd26baf8f4be5e81132.tar.gz kernel-qcow2-linux-f0b04115368ff383654a3bd26baf8f4be5e81132.tar.xz kernel-qcow2-linux-f0b04115368ff383654a3bd26baf8f4be5e81132.zip | |
[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>
Diffstat (limited to 'drivers/md/dm.c')
| -rw-r--r-- | drivers/md/dm.c | 8 |
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) if (!md->disk) goto bad4; + atomic_set(&md->pending, 0); + init_waitqueue_head(&md->wait); + init_waitqueue_head(&md->eventq); + md->disk->major = _major; md->disk->first_minor = minor; md->disk->fops = &dm_blk_dops; @@ -900,10 +904,6 @@ static struct mapped_device *alloc_dev(unsigned int minor, int persistent) add_disk(md->disk); format_dev_t(md->name, MKDEV(_major, minor)); - atomic_set(&md->pending, 0); - init_waitqueue_head(&md->wait); - init_waitqueue_head(&md->eventq); - /* Populate the mapping, nobody knows we exist yet */ spin_lock(&_minor_lock); old_md = idr_replace(&_minor_idr, md, minor); |