Contents of /trunk/kernel26-magellan/patches-2.6.20-r4/0100-2.6.20.1-all-fixes.patch
Parent Directory | Revision Log
Revision 132 -
(show annotations)
(download)
Fri Apr 27 15:24:56 2007 UTC (17 years, 5 months ago) by niro
File size: 1459 byte(s)
Fri Apr 27 15:24:56 2007 UTC (17 years, 5 months ago) by niro
File size: 1459 byte(s)
files for 2.6.20-r4
1 | 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 = { |