From 741bc8f2e460d7481b43316146158c68e3d7b665 Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@linaro.org>
Date: Sat, 3 Nov 2012 23:02:28 +0100
Subject: [PATCH] --- yaml --- r: 345683 b: refs/heads/master c:
 56df127855b593cc4b2e94ce8df5c609b0109b42 h: refs/heads/master i:   345681:
 c696548d033e87303a79af6046427bfa2bcf5cc8   345679:
 722b57bce240f1fde7f8fb6f6bdc0e621273dc22 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/quota/quota.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 299c6de0ff8d..ff4e8d1c0d87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4789775477718983b6f8c604a809b950c6a10052
+refs/heads/master: 56df127855b593cc4b2e94ce8df5c609b0109b42
diff --git a/trunk/fs/quota/quota.c b/trunk/fs/quota/quota.c
index af1661f7a54f..c7314f1771f5 100644
--- a/trunk/fs/quota/quota.c
+++ b/trunk/fs/quota/quota.c
@@ -307,6 +307,8 @@ static int do_quotactl(struct super_block *sb, int type, int cmd, qid_t id,
 	}
 }
 
+#ifdef CONFIG_BLOCK
+
 /* Return 1 if 'cmd' will block on frozen filesystem */
 static int quotactl_cmd_write(int cmd)
 {
@@ -322,6 +324,8 @@ static int quotactl_cmd_write(int cmd)
 	return 1;
 }
 
+#endif /* CONFIG_BLOCK */
+
 /*
  * look up a superblock on which quota ops will be performed
  * - use the name of a block device to find the superblock thereon