diff options
author | J. Bruce Fields <bfields@redhat.com> | 2013-05-15 10:27:52 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2013-05-15 10:35:18 -0400 |
commit | ba4e55bb67894136489b27372166416cd70b0756 (patch) | |
tree | ef46a645fd8946b067f334e4c1747dd755d62236 /fs | |
parent | 2fccbd9cc0fdca649b01f1e2d96e5ef85256341a (diff) |
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>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/nfsd/nfs4xdr.c | 4 |
1 files changed, 3 insertions, 1 deletions
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 | |||
2012 | } | 2012 | } |
2013 | #else | 2013 | #else |
2014 | static inline __be32 | 2014 | static inline __be32 |
2015 | nfsd4_encode_security_label(struct svc_rqst *rqstp, struct dentry *dentry, __be32 **pp, int *buflen) | 2015 | nfsd4_encode_security_label(struct svc_rqst *rqstp, void *context, int len, __be32 **pp, int *buflen) |
2016 | { return 0; } | 2016 | { return 0; } |
2017 | #endif | 2017 | #endif |
2018 | 2018 | ||
@@ -2501,8 +2501,10 @@ out_acl: | |||
2501 | status = nfs_ok; | 2501 | status = nfs_ok; |
2502 | 2502 | ||
2503 | out: | 2503 | out: |
2504 | #ifdef CONFIG_NFSD_V4_SECURITY_LABEL | ||
2504 | if (context) | 2505 | if (context) |
2505 | security_release_secctx(context, contextlen); | 2506 | security_release_secctx(context, contextlen); |
2507 | #endif /* CONFIG_NFSD_V4_SECURITY_LABEL */ | ||
2506 | kfree(acl); | 2508 | kfree(acl); |
2507 | if (fhp == &tempfh) | 2509 | if (fhp == &tempfh) |
2508 | fh_put(&tempfh); | 2510 | fh_put(&tempfh); |