nfsd4: fix compile in !CONFIG_NFSD_V4_SECURITY_LABEL case
authorJ. Bruce Fields <bfields@redhat.com>
Wed, 15 May 2013 14:27:52 +0000 (10:27 -0400)
committerJ. Bruce Fields <bfields@redhat.com>
Wed, 15 May 2013 14:35:18 +0000 (10:35 -0400)
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
fs/nfsd/nfs4xdr.c

index dfca5121de53e60cbbc5b987005f9c78dabc83e2..170ea7e1ae25d23e76e0b417c97d011fa175f699 100644 (file)
@@ -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);