From 4e41eb9b8021f045331e03ea63dda832af1fa5a4 Mon Sep 17 00:00:00 2001
From: Shaohua Li <shli@kernel.org>
Date: Tue, 24 Apr 2012 21:23:46 +0800
Subject: [PATCH] --- yaml --- r: 307709 b: refs/heads/master c:
 7582df516c93046b8d2111a780c69de77f9882fb h: refs/heads/master i:   307707:
 fa317f98ce360fb31705422d09631416a8598930 v: v3

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

diff --git a/[refs] b/[refs]
index 74a30146ffa5..68337f813af0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01c84d2dc1311fb76ea217dadfd5b3a5f3cab563
+refs/heads/master: 7582df516c93046b8d2111a780c69de77f9882fb
diff --git a/trunk/fs/xfs/xfs_super.c b/trunk/fs/xfs/xfs_super.c
index b5aafc395ea1..28d1f508b578 100644
--- a/trunk/fs/xfs/xfs_super.c
+++ b/trunk/fs/xfs/xfs_super.c
@@ -622,7 +622,7 @@ void
 xfs_blkdev_issue_flush(
 	xfs_buftarg_t		*buftarg)
 {
-	blkdev_issue_flush(buftarg->bt_bdev, GFP_KERNEL, NULL);
+	blkdev_issue_flush(buftarg->bt_bdev, GFP_NOFS, NULL);
 }
 
 STATIC void