From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Thu, 29 Mar 2012 18:57:08 +0000 (+0200)
Subject: blkcg: change a spin_lock() to spin_lock_irq()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a5567932fc926739e29e98487128080f40c61710;p=linux-beck.git

blkcg: change a spin_lock() to spin_lock_irq()

Smatch complains that we re-enable IRQs twice.  It looks like we forgot
to disable them here on the spin_trylock() failure path.  This was added
in 9f13ef678e "blkcg: use double locking instead of RCU for blkg
synchronization".

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>`
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index a74019b67311..aa54c4110f54 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -1601,7 +1601,7 @@ static int blkiocg_pre_destroy(struct cgroup_subsys *subsys,
 		} else {
 			spin_unlock_irq(&blkcg->lock);
 			cpu_relax();
-			spin_lock(&blkcg->lock);
+			spin_lock_irq(&blkcg->lock);
 		}
 	}