diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-03-29 14:57:08 -0400 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2012-03-29 14:57:08 -0400 |
commit | a5567932fc926739e29e98487128080f40c61710 (patch) | |
tree | 8bd1995697c0c86f605a6ddb213312454ac7f467 /block | |
parent | eb7d8c07f9c5fca6190b0d328179551122d1b8a3 (diff) |
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.c | 2 |
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, | |||
1601 | } else { | 1601 | } else { |
1602 | spin_unlock_irq(&blkcg->lock); | 1602 | spin_unlock_irq(&blkcg->lock); |
1603 | cpu_relax(); | 1603 | cpu_relax(); |
1604 | spin_lock(&blkcg->lock); | 1604 | spin_lock_irq(&blkcg->lock); |
1605 | } | 1605 | } |
1606 | } | 1606 | } |
1607 | 1607 | ||