Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba4e55bb authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

nfsd4: fix compile in !CONFIG_NFSD_V4_SECURITY_LABEL case 



Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 2fccbd9c

fs/nfsd/nfs4xdr.c

+3 −1
Original line number Diff line number Diff line
@@ -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 @@ nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp, 
	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);