---

yaml --- r: 345683 b: refs/heads/master c: 56df127 h: refs/heads/master i: 345681: c696548 345679: 722b57b v: v3
git-mirror · Dec 13, 2012 · 741bc8f · 741bc8f
1 parent 48effe1
commit 741bc8f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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