From 260efb1c9aed020cb567f9b8fd7c3ed14851e8a0 Mon Sep 17 00:00:00 2001
From: Shaohua Li <shli@kernel.org>
Date: Tue, 22 May 2012 13:55:05 +1000
Subject: [PATCH] --- yaml --- r: 305935 b: refs/heads/master c:
 bc0934f0477d0a2350a478004799d9c064923b7b h: refs/heads/master i:   305933:
 aba8c39b42d8d7edaa1c83d9163ab4426ebef44d   305931:
 2fa380a408229d21bc3e53dbc5e1c62e7d017d02   305927:
 b84084d69ec62c5f73045a176aa388f74439d0c8   305919:
 e19180dc963c59f5aad55694958563b8cc0c1fcc v: v3

---
 [refs]                   |  2 +-
 trunk/drivers/md/raid5.c | 12 ++++++++++--
 trunk/drivers/md/raid5.h |  1 +
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ceef1d8d60b8..ecc480075277 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cceeca43b5ad96766098144a3fd757e03de9f6f8
+refs/heads/master: bc0934f0477d0a2350a478004799d9c064923b7b
diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c
index 962c8f40908f..7bfd59b313d7 100644
--- a/trunk/drivers/md/raid5.c
+++ b/trunk/drivers/md/raid5.c
@@ -539,6 +539,8 @@ static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s)
 			replace_only = 1;
 		} else
 			continue;
+		if (test_and_clear_bit(R5_SyncIO, &sh->dev[i].flags))
+			rw |= REQ_SYNC;
 
 		bi = &sh->dev[i].req;
 		rbi = &sh->dev[i].rreq; /* For writing to replacement */
@@ -1145,6 +1147,8 @@ ops_run_biodrain(struct stripe_head *sh, struct dma_async_tx_descriptor *tx)
 				dev->sector + STRIPE_SECTORS) {
 				if (wbi->bi_rw & REQ_FUA)
 					set_bit(R5_WantFUA, &dev->flags);
+				if (wbi->bi_rw & REQ_SYNC)
+					set_bit(R5_SyncIO, &dev->flags);
 				tx = async_copy_data(1, wbi, dev->page,
 					dev->sector, tx);
 				wbi = r5_next_bio(wbi, dev->sector);
@@ -1162,13 +1166,15 @@ static void ops_complete_reconstruct(void *stripe_head_ref)
 	int pd_idx = sh->pd_idx;
 	int qd_idx = sh->qd_idx;
 	int i;
-	bool fua = false;
+	bool fua = false, sync = false;
 
 	pr_debug("%s: stripe %llu\n", __func__,
 		(unsigned long long)sh->sector);
 
-	for (i = disks; i--; )
+	for (i = disks; i--; ) {
 		fua |= test_bit(R5_WantFUA, &sh->dev[i].flags);
+		sync |= test_bit(R5_SyncIO, &sh->dev[i].flags);
+	}
 
 	for (i = disks; i--; ) {
 		struct r5dev *dev = &sh->dev[i];
@@ -1177,6 +1183,8 @@ static void ops_complete_reconstruct(void *stripe_head_ref)
 			set_bit(R5_UPTODATE, &dev->flags);
 			if (fua)
 				set_bit(R5_WantFUA, &dev->flags);
+			if (sync)
+				set_bit(R5_SyncIO, &dev->flags);
 		}
 	}
 
diff --git a/trunk/drivers/md/raid5.h b/trunk/drivers/md/raid5.h
index c6bdfa01d987..2164021f3b5f 100644
--- a/trunk/drivers/md/raid5.h
+++ b/trunk/drivers/md/raid5.h
@@ -285,6 +285,7 @@ enum r5dev_flags {
 			 */
 	R5_Wantdrain,	/* dev->towrite needs to be drained */
 	R5_WantFUA,	/* Write should be FUA */
+	R5_SyncIO,	/* The IO is sync */
 	R5_WriteError,	/* got a write error - need to record it */
 	R5_MadeGood,	/* A bad block has been fixed by writing to it */
 	R5_ReadRepl,	/* Will/did read from replacement rather than orig */