Annotation of /trunk/kernel26-alx/patches-2.6.20-r6/0100-2.6.20.1-all-fixes.patch
Parent Directory | Revision Log
Revision 1175 -
(hide annotations)
(download)
Thu Oct 14 12:15:46 2010 UTC (13 years, 11 months ago) by niro
File size: 1459 byte(s)
Thu Oct 14 12:15:46 2010 UTC (13 years, 11 months ago) by niro
File size: 1459 byte(s)
-2.6.20-alx-r6 new magellan 0.5.2 kernel
1 | niro | 1175 | diff --git a/fs/nfsd/nfs2acl.c b/fs/nfsd/nfs2acl.c |
2 | index edde5dc..b617428 100644 | ||
3 | --- a/fs/nfsd/nfs2acl.c | ||
4 | +++ b/fs/nfsd/nfs2acl.c | ||
5 | @@ -287,13 +287,20 @@ static int nfsaclsvc_release_getacl(struct svc_rqst *rqstp, __be32 *p, | ||
6 | return 1; | ||
7 | } | ||
8 | |||
9 | -static int nfsaclsvc_release_fhandle(struct svc_rqst *rqstp, __be32 *p, | ||
10 | - struct nfsd_fhandle *resp) | ||
11 | +static int nfsaclsvc_release_attrstat(struct svc_rqst *rqstp, __be32 *p, | ||
12 | + struct nfsd_attrstat *resp) | ||
13 | { | ||
14 | fh_put(&resp->fh); | ||
15 | return 1; | ||
16 | } | ||
17 | |||
18 | +static int nfsaclsvc_release_access(struct svc_rqst *rqstp, __be32 *p, | ||
19 | + struct nfsd3_accessres *resp) | ||
20 | +{ | ||
21 | + fh_put(&resp->fh); | ||
22 | + return 1; | ||
23 | +} | ||
24 | + | ||
25 | #define nfsaclsvc_decode_voidargs NULL | ||
26 | #define nfsaclsvc_encode_voidres NULL | ||
27 | #define nfsaclsvc_release_void NULL | ||
28 | @@ -322,9 +329,9 @@ struct nfsd3_voidargs { int dummy; }; | ||
29 | static struct svc_procedure nfsd_acl_procedures2[] = { | ||
30 | PROC(null, void, void, void, RC_NOCACHE, ST), | ||
31 | PROC(getacl, getacl, getacl, getacl, RC_NOCACHE, ST+1+2*(1+ACL)), | ||
32 | - PROC(setacl, setacl, attrstat, fhandle, RC_NOCACHE, ST+AT), | ||
33 | - PROC(getattr, fhandle, attrstat, fhandle, RC_NOCACHE, ST+AT), | ||
34 | - PROC(access, access, access, fhandle, RC_NOCACHE, ST+AT+1), | ||
35 | + PROC(setacl, setacl, attrstat, attrstat, RC_NOCACHE, ST+AT), | ||
36 | + PROC(getattr, fhandle, attrstat, attrstat, RC_NOCACHE, ST+AT), | ||
37 | + PROC(access, access, access, access, RC_NOCACHE, ST+AT+1), | ||
38 | }; | ||
39 | |||
40 | struct svc_version nfsd_acl_version2 = { |