summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2012-03-29 20:57:08 +0200
committerJens Axboe <axboe@kernel.dk>2012-03-29 20:57:08 +0200
commita5567932fc926739e29e98487128080f40c61710 (patch)
tree8bd1995697c0c86f605a6ddb213312454ac7f467 /block
parenteb7d8c07f9c5fca6190b0d328179551122d1b8a3 (diff)
downloadlinux-a5567932fc926739e29e98487128080f40c61710.tar.gz
linux-a5567932fc926739e29e98487128080f40c61710.tar.bz2
linux-a5567932fc926739e29e98487128080f40c61710.zip
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>
Diffstat (limited to 'block')
-rw-r--r--block/blk-cgroup.c2
1 files changed, 1 insertions, 1 deletions
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);
}
}