From 735c9221af64b2a79da551fd8ca92241d1d2c797 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Fri, 3 Sep 2010 11:56:17 +0200
Subject: [PATCH] --- yaml --- r: 213185 b: refs/heads/master c:
 09d60c701b64b509f328cac72970eb894f485b9e h: refs/heads/master i:   213183:
 ed0faa28f7b9207f8deaefd5c78083600136e35c v: v3

---
 [refs]                  | 2 +-
 trunk/block/blk-flush.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8db455422ca1..3790bb67f66b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47f70d5a6ca78c40a1c799d43506efbfed914f7b
+refs/heads/master: 09d60c701b64b509f328cac72970eb894f485b9e
diff --git a/trunk/block/blk-flush.c b/trunk/block/blk-flush.c
index cb4c8440a1fc..7d1fc982e78f 100644
--- a/trunk/block/blk-flush.c
+++ b/trunk/block/blk-flush.c
@@ -111,6 +111,13 @@ static struct request *queue_next_fseq(struct request_queue *q)
 		break;
 	case QUEUE_FSEQ_DATA:
 		init_request_from_bio(rq, orig_rq->bio);
+		/*
+		 * orig_rq->rq_disk may be different from
+		 * bio->bi_bdev->bd_disk if orig_rq got here through
+		 * remapping drivers.  Make sure rq->rq_disk points
+		 * to the same one as orig_rq.
+		 */
+		rq->rq_disk = orig_rq->rq_disk;
 		rq->cmd_flags &= ~(REQ_FLUSH | REQ_FUA);
 		rq->cmd_flags |= orig_rq->cmd_flags & (REQ_FLUSH | REQ_FUA);
 		rq->end_io = flush_data_end_io;