Return-Path: Received: from mout.kundenserver.de ([217.72.192.73]:60818 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755793AbeASOyY (ORCPT ); Fri, 19 Jan 2018 09:54:24 -0500 From: Arnd Bergmann To: "J. Bruce Fields" , Jeff Layton Cc: Arnd Bergmann , Chuck Lever , Trond Myklebust , Kinglong Mee , linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] NFSD: hide unused svcxdr_dupstr() Date: Fri, 19 Jan 2018 15:54:03 +0100 Message-Id: <20180119145410.1096453-1-arnd@arndb.de> Sender: linux-nfs-owner@vger.kernel.org List-ID: There is now only one caller left for svcxdr_dupstr() and this is inside of an #ifdef, so we can get a warning when the option is disabled: fs/nfsd/nfs4xdr.c:241:1: error: 'svcxdr_dupstr' defined but not used [-Werror=unused-function] This adds another #ifdef around the definition. Fixes: e40d99e6183e ("NFSD: Clean up symlink argument XDR decoders") Signed-off-by: Arnd Bergmann --- fs/nfsd/nfs4xdr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index f51c9cccaf78..374a62af6034 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -237,6 +237,7 @@ svcxdr_tmpalloc(struct nfsd4_compoundargs *argp, u32 len) * Note null-terminating in place usually isn't safe since the * buffer might end on a page boundary. */ +#ifdef CONFIG_NFSD_V4_SECURITY_LABEL static char * svcxdr_dupstr(struct nfsd4_compoundargs *argp, void *buf, u32 len) { @@ -248,6 +249,7 @@ svcxdr_dupstr(struct nfsd4_compoundargs *argp, void *buf, u32 len) p[len] = '\0'; return p; } +#endif /** * savemem - duplicate a chunk of memory for later processing -- 2.9.0