git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'parisc-3.15-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...
[pandora-kernel.git]
/
block
/
blk-core.c
diff --git
a/block/blk-core.c
b/block/blk-core.c
index
34d7c19
..
a0e3096
100644
(file)
--- a/
block/blk-core.c
+++ b/
block/blk-core.c
@@
-1307,7
+1307,7
@@
void __blk_put_request(struct request_queue *q, struct request *req)
struct request_list *rl = blk_rq_rl(req);
BUG_ON(!list_empty(&req->queuelist));
- BUG_ON(
!hlist_unhashed(&req->hash
));
+ BUG_ON(
ELV_ON_HASH(req
));
blk_free_request(rl, req);
freed_request(rl, flags);