From: J. Bruce Fields <bfields@redhat.com>
Date: Wed, 15 May 2013 14:27:52 +0000 (-0400)
Subject: nfsd4: fix compile in !CONFIG_NFSD_V4_SECURITY_LABEL case
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ba4e55bb67894136489b27372166416cd70b0756;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

nfsd4: fix compile in !CONFIG_NFSD_V4_SECURITY_LABEL case

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
---

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index dfca5121de53..170ea7e1ae25 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -2012,7 +2012,7 @@ nfsd4_encode_security_label(struct svc_rqst *rqstp, void *context, int len, __be
 }
 #else
 static inline __be32
-nfsd4_encode_security_label(struct svc_rqst *rqstp, struct dentry *dentry, __be32 **pp, int *buflen)
+nfsd4_encode_security_label(struct svc_rqst *rqstp, void *context, int len, __be32 **pp, int *buflen)
 { return 0; }
 #endif
 
@@ -2501,8 +2501,10 @@ out_acl:
 	status = nfs_ok;
 
 out:
+#ifdef CONFIG_NFSD_V4_SECURITY_LABEL
 	if (context)
 		security_release_secctx(context, contextlen);
+#endif /* CONFIG_NFSD_V4_SECURITY_LABEL */
 	kfree(acl);
 	if (fhp == &tempfh)
 		fh_put(&tempfh);