[PATCH] dm: fix block device initialisation (f0b04115) · Commits · 戴 / test

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>

drivers/md/dm.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -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);

Admin message