Linux-libre 4.2.3-gnupck-4.2.3-gnu

1 files changed, 6 insertions, 0 deletions

diff --git a/block/blk.h b/block/blk.h
index 026d95941..838188b35 100644
--- 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;
 };