Commit 05447420 authored Sep 08, 2010 by Kiyoshi Ueda Committed by Jens Axboe Sep 10, 2010

dm: fix locking context in queue_io()



Now queue_io() is called from dec_pending(), which may be called with
interrupts disabled, so queue_io() must not enable interrupts
unconditionally and must save/restore the current interrupts status.

Signed-off-by: Kiyoshi Ueda <k-ueda@ct.jp.nec.com>
Signed-off-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

parent 6a8736d1

drivers/md/dm.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -512,9 +512,11 @@ static void end_io_acct(struct dm_io *io)
		*/
		static void queue_io(struct mapped_device md, struct bio bio)
		{
		spin_lock_irq(&md->deferred_lock);
		unsigned long flags;

		spin_lock_irqsave(&md->deferred_lock, flags);
		bio_list_add(&md->deferred, bio);
		spin_unlock_irq(&md->deferred_lock);
		spin_unlock_irqrestore(&md->deferred_lock, flags);
		queue_work(md->wq, &md->work);
		}

Admin message