diff options
| author | James Morris <james.l.morris@oracle.com> | 2012-05-03 22:46:40 -0400 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-05-03 22:46:40 -0400 |
| commit | 898bfc1d46bd76f8ea2a0fbd239dd2073efe2aa3 (patch) | |
| tree | e6e666085abe674dbf6292555961fe0a0f2e2d2f /block/blk-throttle.c | |
| parent | 08162e6a23d476544adfe1164afe9ea8b34ab859 (diff) | |
| parent | 69964ea4c7b68c9399f7977aa5b9aa6539a6a98a (diff) | |
Merge tag 'v3.4-rc5' into next
Linux 3.4-rc5
Merge to pull in prerequisite change for Smack:
86812bb0de1a3758dc6c7aa01a763158a7c0638a
Requested by Casey.
Diffstat (limited to 'block/blk-throttle.c')
| -rw-r--r-- | block/blk-throttle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-throttle.c b/block/blk-throttle.c index 5eed6a76721d..f2ddb94626bd 100644 --- a/block/blk-throttle.c +++ b/block/blk-throttle.c | |||
| @@ -1218,7 +1218,7 @@ void blk_throtl_drain(struct request_queue *q) | |||
| 1218 | struct bio_list bl; | 1218 | struct bio_list bl; |
| 1219 | struct bio *bio; | 1219 | struct bio *bio; |
| 1220 | 1220 | ||
| 1221 | WARN_ON_ONCE(!queue_is_locked(q)); | 1221 | queue_lockdep_assert_held(q); |
| 1222 | 1222 | ||
| 1223 | bio_list_init(&bl); | 1223 | bio_list_init(&bl); |
| 1224 | 1224 | ||