NFSD: hide unused svcxdr_dupstr()

Web:        https://git.kernel.org/torvalds/c/2285ae760de2cbe4b91a55c0a8033ec332fb8049
Commit:     2285ae760de2cbe4b91a55c0a8033ec332fb8049
Parent:     39ca1bf624b6b82cc895b0217889eaaf572a7913
Refname:    refs/heads/master
Author:     Arnd Bergmann <[email protected]>
AuthorDate: Mon Jan 22 22:09:12 2018 +0100
Committer:  J. Bruce Fields <[email protected]>
CommitDate: Thu Feb 8 13:40:17 2018 -0500

    NFSD: hide unused svcxdr_dupstr()
    
    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 changes the remaining caller to use a nicer IS_ENABLED() check,
    which lets the compiler drop the unused code silently.
    
    Fixes: e40d99e6183e ("NFSD: Clean up symlink argument XDR decoders")
    Suggested-by: Rasmus Villemoes <[email protected]>
    Signed-off-by: Arnd Bergmann <[email protected]>
    Signed-off-by: J. Bruce Fields <[email protected]>
---
 fs/nfsd/nfs4xdr.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index e4395abd0f2b..e502fd16246b 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -455,8 +455,8 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,
 	}
 
 	label->len = 0;
-#ifdef CONFIG_NFSD_V4_SECURITY_LABEL
-	if (bmval[2] & FATTR4_WORD2_SECURITY_LABEL) {
+	if (IS_ENABLED(CONFIG_NFSD_V4_SECURITY_LABEL) &&
+	    bmval[2] & FATTR4_WORD2_SECURITY_LABEL) {
 		READ_BUF(4);
 		len += 4;
 		dummy32 = be32_to_cpup(p++); /* lfs: we don't use it */
@@ -476,7 +476,6 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,
 		if (!label->data)
 			return nfserr_jukebox;
 	}
-#endif
 	if (bmval[2] & FATTR4_WORD2_MODE_UMASK) {
 		if (!umask)
 			goto xdr_error;
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html