From patchwork Sat Sep 16 20:32:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 112818 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp2065432qgf; Sat, 16 Sep 2017 13:36:19 -0700 (PDT) X-Google-Smtp-Source: ADKCNb52axkBRc7v0VYAdhWOIRY/h6RsV1p6wD1Rxk8pLf1/SdRi3OzI3SeXJb8mkTEqqyhYGaUG X-Received: by 10.159.218.7 with SMTP id v7mr32763387plp.322.1505594179750; Sat, 16 Sep 2017 13:36:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505594179; cv=none; d=google.com; s=arc-20160816; b=iwu0LzopvYWc5Na3ue/I1UlAUciwAfwQ9/FN4PSTuKxHBXdaQ4BgkAwm8BesDgPphs ak4gNskDKU8Bcl7EMw9DN7MOwt0SPLHKHW0lE3holBJGotVv1xTvaHkSqZZlFxLs43QO VEHYw5yK8exsEKxh8CGeDqmsK6F2Wh2lb/xtpg66auLc0o8/+zhaeA4AAEdqtdZDftC1 9XarNEzrvUGbxYjIxAyF4/YEF6LlNlvRGz1j43CDNRnHg3mc1LstUGXHvw01C6xJptNN MwIY3xteNV0KmlJxTeUw6kAviD/tpzJxVctbjV0TJ2RGX9/oq7Xu5bY9xi6iPreDpVwl BR8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=N4H+ONKctfCCNai5wD+a3piupMU/I6CVEgWQJve0pP4=; b=RJjEUYgi+bT8V0v/3ohbGL2NWL4xls7K5X9tUdwPr3Ik9HmruWgtZv0mw0ak5c8qCU 2ju67AJrrvJ3PrvHDR4TiCGUDkhS15Wr4foQ8ZL+VIGILHNpK9xlSqgAB4JXh5VPDXy1 wUnNgzJoP8tFXnS2jYgRYy7iTTv0CpHz3sVXWnZV+R2u32lSwxSM7XMjIJrxdUPYnHNV Db08ZezFIxrGoY9rUFgVLFP4mHvBm+EsTg8G97iru14NhUbdljjhGvb23uS9XI255EwE P7RKosM+v96GNU5YiCBOJ+Tc5Vpm74X7VZpGgJFwCbZRaTbj/xHROzY0kM7BI8qDNj88 QX5g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p20si2443994pgd.651.2017.09.16.13.36.17; Sat, 16 Sep 2017 13:36:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751330AbdIPUct (ORCPT + 26 others); Sat, 16 Sep 2017 16:32:49 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:53226 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750937AbdIPUcr (ORCPT ); Sat, 16 Sep 2017 16:32:47 -0400 Received: from wuerfel.lan ([95.208.190.237]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.129]) with ESMTPA (Nemesis) id 0MQBed-1dpD281nUJ-005EqL; Sat, 16 Sep 2017 22:32:35 +0200 From: Arnd Bergmann To: Jan Kara , David Howells , Al Viro Cc: Arnd Bergmann , Ingo Molnar , linux-kernel@vger.kernel.org Subject: [PATCH] isofs: fix build regression Date: Sat, 16 Sep 2017 22:32:12 +0200 Message-Id: <20170916203233.235050-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:gAaTiiffsTN6FDjFlxq/hwtsOfYGWdLTIi3nKCv97W7JuBNq45J 0WH0/j0k70H+bXRrqvusoaELy6aBz4DDk7bn/4X2CsOkuP9mGljcWlpNi3MMF7AW2miMBuq ummcBLHSck9vRIMsDh6IYNWF+2xBSmTQZbpti3xmFlVRnkTmbyKpJYS+ww09bagmeGbKaFb TNlsm4yrZ8PPrTZDpQW4w== X-UI-Out-Filterresults: notjunk:1; V01:K0:ERXw1lw8NUo=:06oc3vI7Rzjc9MeDGlQqct eqOXZyHFByWMKJS/NiEQOQ/CP/pm8yyxKmjILnKRgLlx297VELRawwflIrMxZ/tdUVg9z6P8h 3ZE++0/DR7ahxw6LBoETuFPuFoX18Z/Wjs6Kg6U5fkjL/7oTKVE0QwxcKcyxDuSEAWwGW4arY q1BuSkIKSN3SwLTEtXic/EMJnfZKR6jN//DmjNgVp4QpuESHsSrwyxvz5XIGS4VWPhK1r/Uh2 8uTca/8sMWPNviwVueAIvulWtrNlCW6ria0IRjObSRFfots9wNTA/itECWe0rS/9WTzmIuZ6E jGGV6tLfPoteZBoAZ0a+swqyqJVm6wu4i4mKvwGmchiF8MaytxbPjr+lKsVEKdhVWbhbIW+pb 5Xx6rhyTfQ+7J9KDGVGzr2VzMU1sCwRyG2Vs6NNd6DVo8r6QxvwrHaep4quu4RUwLyxMITI+G +VwFO42OieS1CWAhRTml0StvBwIVDmchaqOdqEV3NYPo/ZGjdY0BGSXoX4kF60AxyzGOQr//W i4bNoX0eaKTrD8irhWhWphgvvabXvqIFkj6HLk4q9C8yZhKHg/FneXtkS78vaMCFJpXmHRn2X gcCUV9m2sudlzVVD4dta/bypsZfVKwqt6XALIq+W5k+1UOZ2JGyggrAJ0xLnKv6wq6WeLWOTp SfeXR75r+ENGdNDhcDxQwCuYv7wmi9GDejUXJxKhc1/4FP6t2zEfd5D/bL0XChvsQpVbDSdi+ T6WEwJ9VVUhDVUdoNPK+ZQ4DX+SRqHTlLIIizQ== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The new isofs_show_options() function fails to build when CONFIG_NLS is disabled: fs/isofs/inode.c: In function 'isofs_show_options': fs/isofs/inode.c:518:44: error: 'CONFIG_NLS_DEFAULT' undeclared (first use in this function) fs/isofs/inode.c:518:44: note: each undeclared identifier is reported only once for each function it appears in This adds a check for CONFIG_JOLIET (which selects NLS), matching the other uses of the iocharset handling in this file. Fixes: 6fecb86a44f5 ("isofs: Implement show_options") Signed-off-by: Arnd Bergmann --- fs/isofs/inode.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.9.0 diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c index 6fa7c4dbc200..bc258a4402f6 100644 --- a/fs/isofs/inode.c +++ b/fs/isofs/inode.c @@ -514,9 +514,11 @@ static int isofs_show_options(struct seq_file *m, struct dentry *root) if (sbi->s_fmode != ISOFS_INVALID_MODE) seq_printf(m, ",fmode=%o", sbi->s_fmode); +#ifdef CONFIG_JOLIET if (sbi->s_nls_iocharset && strcmp(sbi->s_nls_iocharset->charset, CONFIG_NLS_DEFAULT) != 0) seq_printf(m, ",iocharset=%s", sbi->s_nls_iocharset->charset); +#endif return 0; }