projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.14' of git://linux-nfs.org/~bfields/linux
[profile/ivi/kernel-x86-ivi.git]
/
block
/
blk.h
diff --git
a/block/blk.h
b/block/blk.h
index
c90e1d8
..
d23b415
100644
(file)
--- a/
block/blk.h
+++ b/
block/blk.h
@@
-113,7
+113,7
@@
static inline struct request *__elv_next_request(struct request_queue *q)
q->flush_queue_delayed = 1;
return NULL;
}
- if (unlikely(blk_queue_
dying
(q)) ||
+ if (unlikely(blk_queue_
bypass
(q)) ||
!q->elevator->type->ops.elevator_dispatch_fn(q, 0))
return NULL;
}