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
block: attempt to merge with existing requests on plug flush
[pandora-kernel.git]
/
include
/
linux
/
elevator.h
diff --git
a/include/linux/elevator.h
b/include/linux/elevator.h
index
ec6f72b
..
d93efcc
100644
(file)
--- a/
include/linux/elevator.h
+++ b/
include/linux/elevator.h
@@
-166,6
+166,7
@@
extern struct request *elv_rb_find(struct rb_root *, sector_t);
#define ELEVATOR_INSERT_SORT 3
#define ELEVATOR_INSERT_REQUEUE 4
#define ELEVATOR_INSERT_FLUSH 5
+#define ELEVATOR_INSERT_SORT_MERGE 6
/*
* return values from elevator_may_queue_fn