projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.10.55' into update
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
block
/
blk.h
diff --git
a/block/blk.h
b/block/blk.h
index e837b8f619b7d646825d43ea5ddeb9beacbea3d2..b3bdeb36f361d6ad88d6a9f271cbc2715358ff88 100644
(file)
--- a/
block/blk.h
+++ b/
block/blk.h
@@
-96,7
+96,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;
}