From patchwork Sat Nov 3 22:02:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 12658 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id B97D923FBB for ; Sat, 3 Nov 2012 22:02:58 +0000 (UTC) Received: from mail-da0-f52.google.com (mail-da0-f52.google.com [209.85.210.52]) by fiordland.canonical.com (Postfix) with ESMTP id 582A4A18455 for ; Sat, 3 Nov 2012 22:02:58 +0000 (UTC) Received: by mail-da0-f52.google.com with SMTP id f10so2036033dak.11 for ; Sat, 03 Nov 2012 15:02:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding :x-gm-message-state; bh=Q1C/OcASX6R3lKD0I5nikdURDwZfgOdHR4U98kXh+zo=; b=I5tXEYhvEaHsnausGpYs+nImUtnzN2Fu6ZufAST7wCG8b54NVkDcTzKjZlDuJc66AF 8fNJH96fjKCDQdjRL4N2grZyEz8bORceUVIsuueq25/arGVJ8A7gboi9c2CAcFkn0xiP eYO8VFK4cjz3KGLEyVSE/qIMjnyQnCXHD1wnIgMS2bxmujh4xue837vhTsYQc1p80u98 RSZNphSKJzE7yWqvRemWdlu2qJq7EIb+4EdJJApt7ZuVkKu2Pn+vJP0CtySBBEVgq3yc +XldoyoTWYv3g74E0+lIAxbPc9s43uvVoQ5QwTveArLN6hurTYPdzkW93ZM8k8teI84q tQdg== Received: by 10.68.231.69 with SMTP id te5mr17872771pbc.81.1351980178075; Sat, 03 Nov 2012 15:02:58 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.68.34.137 with SMTP id z9csp94646pbi; Sat, 3 Nov 2012 15:02:57 -0700 (PDT) Received: by 10.14.179.136 with SMTP id h8mr20729165eem.7.1351980176933; Sat, 03 Nov 2012 15:02:56 -0700 (PDT) Received: from mail-ea0-f170.google.com (mail-ea0-f170.google.com [209.85.215.170]) by mx.google.com with ESMTPS id f7si2282590eeo.106.2012.11.03.15.02.56 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 03 Nov 2012 15:02:56 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.170 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.215.170; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.215.170 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-ea0-f170.google.com with SMTP id a13so1963264eaa.29 for ; Sat, 03 Nov 2012 15:02:56 -0700 (PDT) Received: by 10.14.184.2 with SMTP id r2mr20277999eem.43.1351980176238; Sat, 03 Nov 2012 15:02:56 -0700 (PDT) Received: from localhost.localdomain (88.Red-2-139-206.staticIP.rima-tde.net. [2.139.206.88]) by mx.google.com with ESMTPS id d44sm34844369eeo.10.2012.11.03.15.02.54 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 03 Nov 2012 15:02:55 -0700 (PDT) From: Lee Jones To: linux-kernel@vger.kernel.org Cc: Lee Jones , Jan Kara Subject: [PATCH 7/9] quota: Use the pre-processor to compile out quotactl_cmd_write when !CONFIG_BLOCK Date: Sat, 3 Nov 2012 23:02:28 +0100 Message-Id: <1351980150-24145-8-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1351980150-24145-1-git-send-email-lee.jones@linaro.org> References: <1351980150-24145-1-git-send-email-lee.jones@linaro.org> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQlzWh+0E+hbWZk1MvfIrl7I/uyze6qwQKXr1eDeG4ZmuX/XATQ/UKjshaAGeTe7MCRWtnLK 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 --- fs/quota/quota.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/quota/quota.c b/fs/quota/quota.c index af1661f..c7314f1 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