diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-20 02:28:45 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-20 13:26:40 -0400 |
commit | 7111c66e4e70588c9602035a4996c9cdc2087d2d (patch) | |
tree | 1fbd19547470c9d776c6e34a547eb181b5d4fe5f /fs/nfsd/nfs2acl.c | |
parent | cc45f0175088e000ac7493e5e3f05579b6f7d240 (diff) |
[PATCH] fix svc_procfunc declaration
svc_procfunc instances return __be32, not int
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Trond Myklebust <trond.myklebust@fys.uio.no>
Acked-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/nfsd/nfs2acl.c')
-rw-r--r-- | fs/nfsd/nfs2acl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/nfsd/nfs2acl.c b/fs/nfsd/nfs2acl.c index 9187755661df..8d48616882c1 100644 --- a/fs/nfsd/nfs2acl.c +++ b/fs/nfsd/nfs2acl.c | |||
@@ -21,7 +21,7 @@ | |||
21 | /* | 21 | /* |
22 | * NULL call. | 22 | * NULL call. |
23 | */ | 23 | */ |
24 | static int | 24 | static __be32 |
25 | nfsacld_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) | 25 | nfsacld_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) |
26 | { | 26 | { |
27 | return nfs_ok; | 27 | return nfs_ok; |
@@ -30,7 +30,7 @@ nfsacld_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) | |||
30 | /* | 30 | /* |
31 | * Get the Access and/or Default ACL of a file. | 31 | * Get the Access and/or Default ACL of a file. |
32 | */ | 32 | */ |
33 | static int nfsacld_proc_getacl(struct svc_rqst * rqstp, | 33 | static __be32 nfsacld_proc_getacl(struct svc_rqst * rqstp, |
34 | struct nfsd3_getaclargs *argp, struct nfsd3_getaclres *resp) | 34 | struct nfsd3_getaclargs *argp, struct nfsd3_getaclres *resp) |
35 | { | 35 | { |
36 | svc_fh *fh; | 36 | svc_fh *fh; |
@@ -97,7 +97,7 @@ fail: | |||
97 | /* | 97 | /* |
98 | * Set the Access and/or Default ACL of a file. | 98 | * Set the Access and/or Default ACL of a file. |
99 | */ | 99 | */ |
100 | static int nfsacld_proc_setacl(struct svc_rqst * rqstp, | 100 | static __be32 nfsacld_proc_setacl(struct svc_rqst * rqstp, |
101 | struct nfsd3_setaclargs *argp, | 101 | struct nfsd3_setaclargs *argp, |
102 | struct nfsd_attrstat *resp) | 102 | struct nfsd_attrstat *resp) |
103 | { | 103 | { |
@@ -128,7 +128,7 @@ static int nfsacld_proc_setacl(struct svc_rqst * rqstp, | |||
128 | /* | 128 | /* |
129 | * Check file attributes | 129 | * Check file attributes |
130 | */ | 130 | */ |
131 | static int nfsacld_proc_getattr(struct svc_rqst * rqstp, | 131 | static __be32 nfsacld_proc_getattr(struct svc_rqst * rqstp, |
132 | struct nfsd_fhandle *argp, struct nfsd_attrstat *resp) | 132 | struct nfsd_fhandle *argp, struct nfsd_attrstat *resp) |
133 | { | 133 | { |
134 | dprintk("nfsd: GETATTR %s\n", SVCFH_fmt(&argp->fh)); | 134 | dprintk("nfsd: GETATTR %s\n", SVCFH_fmt(&argp->fh)); |
@@ -140,7 +140,7 @@ static int nfsacld_proc_getattr(struct svc_rqst * rqstp, | |||
140 | /* | 140 | /* |
141 | * Check file access | 141 | * Check file access |
142 | */ | 142 | */ |
143 | static int nfsacld_proc_access(struct svc_rqst *rqstp, struct nfsd3_accessargs *argp, | 143 | static __be32 nfsacld_proc_access(struct svc_rqst *rqstp, struct nfsd3_accessargs *argp, |
144 | struct nfsd3_accessres *resp) | 144 | struct nfsd3_accessres *resp) |
145 | { | 145 | { |
146 | int nfserr; | 146 | int nfserr; |