From 102ed704ae06d3687ec41113527f04ab2af33b76 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Fri, 8 Jul 2011 14:34:14 +0200
Subject: [PATCH] --- yaml --- r: 255120 b: refs/heads/master c:
 dbcdde3e76f45d56c4a30ca6c5d69b6d473d3fd1 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/fs/xfs/linux-2.6/xfs_aops.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 84362f477935..b579b9aa8e33 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 680a647b49fa52de0b37b8bc58a3a8c4bc76b262
+refs/heads/master: dbcdde3e76f45d56c4a30ca6c5d69b6d473d3fd1
diff --git a/trunk/fs/xfs/linux-2.6/xfs_aops.c b/trunk/fs/xfs/linux-2.6/xfs_aops.c
index 60e1364a191f..3447733fa897 100644
--- a/trunk/fs/xfs/linux-2.6/xfs_aops.c
+++ b/trunk/fs/xfs/linux-2.6/xfs_aops.c
@@ -959,7 +959,7 @@ xfs_vm_writepage(
 	offset = page_offset(page);
 	type = IO_OVERWRITE;
 
-	if (wbc->sync_mode == WB_SYNC_NONE && wbc->nonblocking)
+	if (wbc->sync_mode == WB_SYNC_NONE)
 		nonblocking = 1;
 
 	do {