From patchwork Wed Oct 10 14:27:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 981920 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=arndb.de Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42Vc082Jzcz9s89 for ; Thu, 11 Oct 2018 01:28:24 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727056AbeJJVus (ORCPT ); Wed, 10 Oct 2018 17:50:48 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:37645 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726903AbeJJVus (ORCPT ); Wed, 10 Oct 2018 17:50:48 -0400 Received: from wuerfel.lan ([109.193.40.16]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.145]) with ESMTPA (Nemesis) id 1MXpQA-1gBSIF3kzM-00Y75n; Wed, 10 Oct 2018 16:28:16 +0200 Received: from wuerfel.lan ([109.193.40.16]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.145]) with ESMTPA (Nemesis) id 1MXpQA-1gBSIF3kzM-00Y75n; Wed, 10 Oct 2018 16:28:16 +0200 From: Arnd Bergmann To: "Theodore Ts'o" , Andreas Dilger Cc: Arnd Bergmann , Jan Kara , Eric Biggers , linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ext4: avoid unused variable warning Date: Wed, 10 Oct 2018 16:27:58 +0200 Message-Id: <20181010142813.1918180-1-arnd@arndb.de> X-Mailer: git-send-email 2.18.0 X-Provags-ID: V03:K1:2Ddw13HeTrQQBUtKVjTSl/urr2EjV8KBDC1s+JJ7P21ofjDeJZv EcjMlb3eMYy7QG0x/alBZL6+fGGdWuY91LiI7DbPBN3NiHbH+fCmvPFWfiiOZZWltERXVfg JFH64PH/HxFzsvza5cFZd79z0QFkQ0O2LAFreECxN1yvL3bm6KacX6cTQQB77W+I55OMes2 rQycT/vW4vaqHRmgFCI9A== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V01:K0:zq2JKL5SPsE=:zw8u89C2XDlw0s0KYO9iUf TkjdKfb5gzT3uTQOxuuFF7KL7SqIphRstwZ/TJDJY9bQIPLxCQHZMFU3F6kz5WQnXoZ3aCm5c OwW1r+bqx1rbbeL8nxPzxEc2TZg8ikbM+ia5wBariGQDNgITBopksUrNkDmn+QbFzP3kFiIOe PKfy0KF9LhnMqO6argGAPaCG77tLJhbszXeFbI/VsaDiD0jJefLlz3p1oPIDZO16zOTir6cpy pnHlKsejUpXenDF2GAy0B44WUM5vRafPdHmEldCpO+lu+RFMAvjmB7Ffd8v/uNipaB1SDiaHn /pxQ0JMjpCebd+vOm+bTqT7u8GnNhGbRtsmfuDKHIw+vGB1qzvFAQ689S9b7CYvrxwtRi2Qny rhUJT4JrfOmw+yQJ3SlCVMkn9xWLV5ARkhpFIb6PJJhsMtacdOOOjy1W2h1CsQD+AX8fxnt4Y XNH34xBi2bGq0ouQpmJ0Ce4GpE+bBDSj1uDHxhIpABifWgJPNFPxkuYNX4ONIHdytuzweJtyF NZz7UCKmoIjbx5slUD0BeN40nKC1b+dJ3aGdv0VYctRVJaM0Eruwp7omfesB9iIwG+ZzUvsJ6 41ICwcm3wnFjn8L7fQAy/wBBf81QodM/AJRRMden3v33JMyeV+8weNFQS5Vdkn3kluosQdU/M LfbjnLh/C24CBiTKibCvXhLYwGHfMDx2jXq1CfbY7AgQ+hdc1KyUYfMuo599dep/XAVM= Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org The two new variables are only used in an #ifdef, so they cause a warning without CONFIG_QUOTA: fs/ext4/super.c: In function 'parse_options': fs/ext4/super.c:1977:26: error: unused variable 'grp_qf_name' [-Werror=unused-variable] char *p, *usr_qf_name, *grp_qf_name; ^~~~~~~~~~~ fs/ext4/super.c:1977:12: error: unused variable 'usr_qf_name' [-Werror=unused-variable] char *p, *usr_qf_name, *grp_qf_name; Fixes: 20cefcdc2040 ("ext4: fix use-after-free race in ext4_remount()'s error path") Signed-off-by: Arnd Bergmann --- fs/ext4/super.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index e9ca8312457b..d60199510c94 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -1974,7 +1974,10 @@ static int parse_options(char *options, struct super_block *sb, int is_remount) { struct ext4_sb_info *sbi = EXT4_SB(sb); - char *p, *usr_qf_name, *grp_qf_name; + char *p; +#ifdef CONFIG_QUOTA + char *usr_qf_name, *grp_qf_name; +#endif substring_t args[MAX_OPT_ARGS]; int token;