projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.3/blkcg' of git://git.kernel.dk/linux-block
[cascardo/linux.git]
/
block
/
blk.h
diff --git
a/block/blk.h
b/block/blk.h
index
d905b26
..
98614ad
100644
(file)
--- a/
block/blk.h
+++ b/
block/blk.h
@@
-22,6
+22,12
@@
struct blk_flush_queue {
struct list_head flush_queue[2];
struct list_head flush_data_in_flight;
struct request *flush_rq;
+
+ /*
+ * flush_rq shares tag with this rq, both can't be active
+ * at the same time
+ */
+ struct request *orig_rq;
spinlock_t mq_flush_lock;
};