From: Lee Jones Date: Sat, 3 Nov 2012 22:02:28 +0000 (+0100) Subject: quota: Use the pre-processor to compile out quotactl_cmd_write when !CONFIG_BLOCK X-Git-Tag: firefly_0821_release~3680^2~1421^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=56df127855b593cc4b2e94ce8df5c609b0109b42;p=firefly-linux-kernel-4.4.55.git 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 Signed-off-by: Lee Jones Signed-off-by: Jan Kara --- 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