diff options
Diffstat (limited to 'fs/nfsd')
-rw-r--r-- | fs/nfsd/nfs2acl.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/fs/nfsd/nfs2acl.c b/fs/nfsd/nfs2acl.c index edde5dc5f796..b61742885011 100644 --- a/fs/nfsd/nfs2acl.c +++ b/fs/nfsd/nfs2acl.c | |||
@@ -287,13 +287,20 @@ static int nfsaclsvc_release_getacl(struct svc_rqst *rqstp, __be32 *p, | |||
287 | return 1; | 287 | return 1; |
288 | } | 288 | } |
289 | 289 | ||
290 | static int nfsaclsvc_release_fhandle(struct svc_rqst *rqstp, __be32 *p, | 290 | static int nfsaclsvc_release_attrstat(struct svc_rqst *rqstp, __be32 *p, |
291 | struct nfsd_fhandle *resp) | 291 | struct nfsd_attrstat *resp) |
292 | { | 292 | { |
293 | fh_put(&resp->fh); | 293 | fh_put(&resp->fh); |
294 | return 1; | 294 | return 1; |
295 | } | 295 | } |
296 | 296 | ||
297 | static int nfsaclsvc_release_access(struct svc_rqst *rqstp, __be32 *p, | ||
298 | struct nfsd3_accessres *resp) | ||
299 | { | ||
300 | fh_put(&resp->fh); | ||
301 | return 1; | ||
302 | } | ||
303 | |||
297 | #define nfsaclsvc_decode_voidargs NULL | 304 | #define nfsaclsvc_decode_voidargs NULL |
298 | #define nfsaclsvc_encode_voidres NULL | 305 | #define nfsaclsvc_encode_voidres NULL |
299 | #define nfsaclsvc_release_void NULL | 306 | #define nfsaclsvc_release_void NULL |
@@ -322,9 +329,9 @@ struct nfsd3_voidargs { int dummy; }; | |||
322 | static struct svc_procedure nfsd_acl_procedures2[] = { | 329 | static struct svc_procedure nfsd_acl_procedures2[] = { |
323 | PROC(null, void, void, void, RC_NOCACHE, ST), | 330 | PROC(null, void, void, void, RC_NOCACHE, ST), |
324 | PROC(getacl, getacl, getacl, getacl, RC_NOCACHE, ST+1+2*(1+ACL)), | 331 | PROC(getacl, getacl, getacl, getacl, RC_NOCACHE, ST+1+2*(1+ACL)), |
325 | PROC(setacl, setacl, attrstat, fhandle, RC_NOCACHE, ST+AT), | 332 | PROC(setacl, setacl, attrstat, attrstat, RC_NOCACHE, ST+AT), |
326 | PROC(getattr, fhandle, attrstat, fhandle, RC_NOCACHE, ST+AT), | 333 | PROC(getattr, fhandle, attrstat, attrstat, RC_NOCACHE, ST+AT), |
327 | PROC(access, access, access, fhandle, RC_NOCACHE, ST+AT+1), | 334 | PROC(access, access, access, access, RC_NOCACHE, ST+AT+1), |
328 | }; | 335 | }; |
329 | 336 | ||
330 | struct svc_version nfsd_acl_version2 = { | 337 | struct svc_version nfsd_acl_version2 = { |