summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2012-11-03 23:02:28 +0100
committerJan Kara <jack@suse.cz>2012-12-13 16:33:24 +0100
commit56df127855b593cc4b2e94ce8df5c609b0109b42 (patch)
tree79b57b4e228cf35906e2a2a377fb0b5e167f5f1d
parent4789775477718983b6f8c604a809b950c6a10052 (diff)
downloadlinux-stable-56df127855b593cc4b2e94ce8df5c609b0109b42.tar.gz
linux-stable-56df127855b593cc4b2e94ce8df5c609b0109b42.tar.bz2
linux-stable-56df127855b593cc4b2e94ce8df5c609b0109b42.zip
quota: Use the pre-processor to compile out quotactl_cmd_write when !CONFIG_BLOCK
quotactl_cmd_write() is only ever invoked when BLOCK is configured. When !CONFIG_BLOCK, the build warning below is displayed. Let's fix that. fs/quota/quota.c:311:12: warning: ‘quotactl_cmd_write’ defined but not used [-Wunused-function] Cc: Jan Kara <jack@suse.cz> Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Jan Kara <jack@suse.cz>
-rw-r--r--fs/quota/quota.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/quota/quota.c b/fs/quota/quota.c
index af1661f7a54f..c7314f1771f5 100644
--- a/fs/quota/quota.c
+++ b/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