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/nfsproc.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/nfsproc.c')
-rw-r--r-- | fs/nfsd/nfsproc.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/fs/nfsd/nfsproc.c b/fs/nfsd/nfsproc.c index 9ee1dab5d44a..09030afd7249 100644 --- a/fs/nfsd/nfsproc.c +++ b/fs/nfsd/nfsproc.c | |||
@@ -30,7 +30,7 @@ typedef struct svc_buf svc_buf; | |||
30 | #define NFSDDBG_FACILITY NFSDDBG_PROC | 30 | #define NFSDDBG_FACILITY NFSDDBG_PROC |
31 | 31 | ||
32 | 32 | ||
33 | static int | 33 | static __be32 |
34 | nfsd_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) | 34 | nfsd_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) |
35 | { | 35 | { |
36 | return nfs_ok; | 36 | return nfs_ok; |
@@ -56,7 +56,7 @@ nfsd_return_dirop(int err, struct nfsd_diropres *resp) | |||
56 | * Get a file's attributes | 56 | * Get a file's attributes |
57 | * N.B. After this call resp->fh needs an fh_put | 57 | * N.B. After this call resp->fh needs an fh_put |
58 | */ | 58 | */ |
59 | static int | 59 | static __be32 |
60 | nfsd_proc_getattr(struct svc_rqst *rqstp, struct nfsd_fhandle *argp, | 60 | nfsd_proc_getattr(struct svc_rqst *rqstp, struct nfsd_fhandle *argp, |
61 | struct nfsd_attrstat *resp) | 61 | struct nfsd_attrstat *resp) |
62 | { | 62 | { |
@@ -72,7 +72,7 @@ nfsd_proc_getattr(struct svc_rqst *rqstp, struct nfsd_fhandle *argp, | |||
72 | * Set a file's attributes | 72 | * Set a file's attributes |
73 | * N.B. After this call resp->fh needs an fh_put | 73 | * N.B. After this call resp->fh needs an fh_put |
74 | */ | 74 | */ |
75 | static int | 75 | static __be32 |
76 | nfsd_proc_setattr(struct svc_rqst *rqstp, struct nfsd_sattrargs *argp, | 76 | nfsd_proc_setattr(struct svc_rqst *rqstp, struct nfsd_sattrargs *argp, |
77 | struct nfsd_attrstat *resp) | 77 | struct nfsd_attrstat *resp) |
78 | { | 78 | { |
@@ -92,7 +92,7 @@ nfsd_proc_setattr(struct svc_rqst *rqstp, struct nfsd_sattrargs *argp, | |||
92 | * doesn't exist yet. | 92 | * doesn't exist yet. |
93 | * N.B. After this call resp->fh needs an fh_put | 93 | * N.B. After this call resp->fh needs an fh_put |
94 | */ | 94 | */ |
95 | static int | 95 | static __be32 |
96 | nfsd_proc_lookup(struct svc_rqst *rqstp, struct nfsd_diropargs *argp, | 96 | nfsd_proc_lookup(struct svc_rqst *rqstp, struct nfsd_diropargs *argp, |
97 | struct nfsd_diropres *resp) | 97 | struct nfsd_diropres *resp) |
98 | { | 98 | { |
@@ -112,7 +112,7 @@ nfsd_proc_lookup(struct svc_rqst *rqstp, struct nfsd_diropargs *argp, | |||
112 | /* | 112 | /* |
113 | * Read a symlink. | 113 | * Read a symlink. |
114 | */ | 114 | */ |
115 | static int | 115 | static __be32 |
116 | nfsd_proc_readlink(struct svc_rqst *rqstp, struct nfsd_readlinkargs *argp, | 116 | nfsd_proc_readlink(struct svc_rqst *rqstp, struct nfsd_readlinkargs *argp, |
117 | struct nfsd_readlinkres *resp) | 117 | struct nfsd_readlinkres *resp) |
118 | { | 118 | { |
@@ -132,7 +132,7 @@ nfsd_proc_readlink(struct svc_rqst *rqstp, struct nfsd_readlinkargs *argp, | |||
132 | * Read a portion of a file. | 132 | * Read a portion of a file. |
133 | * N.B. After this call resp->fh needs an fh_put | 133 | * N.B. After this call resp->fh needs an fh_put |
134 | */ | 134 | */ |
135 | static int | 135 | static __be32 |
136 | nfsd_proc_read(struct svc_rqst *rqstp, struct nfsd_readargs *argp, | 136 | nfsd_proc_read(struct svc_rqst *rqstp, struct nfsd_readargs *argp, |
137 | struct nfsd_readres *resp) | 137 | struct nfsd_readres *resp) |
138 | { | 138 | { |
@@ -172,7 +172,7 @@ nfsd_proc_read(struct svc_rqst *rqstp, struct nfsd_readargs *argp, | |||
172 | * Write data to a file | 172 | * Write data to a file |
173 | * N.B. After this call resp->fh needs an fh_put | 173 | * N.B. After this call resp->fh needs an fh_put |
174 | */ | 174 | */ |
175 | static int | 175 | static __be32 |
176 | nfsd_proc_write(struct svc_rqst *rqstp, struct nfsd_writeargs *argp, | 176 | nfsd_proc_write(struct svc_rqst *rqstp, struct nfsd_writeargs *argp, |
177 | struct nfsd_attrstat *resp) | 177 | struct nfsd_attrstat *resp) |
178 | { | 178 | { |
@@ -197,7 +197,7 @@ nfsd_proc_write(struct svc_rqst *rqstp, struct nfsd_writeargs *argp, | |||
197 | * and the actual create() call in compliance with VFS protocols. | 197 | * and the actual create() call in compliance with VFS protocols. |
198 | * N.B. After this call _both_ argp->fh and resp->fh need an fh_put | 198 | * N.B. After this call _both_ argp->fh and resp->fh need an fh_put |
199 | */ | 199 | */ |
200 | static int | 200 | static __be32 |
201 | nfsd_proc_create(struct svc_rqst *rqstp, struct nfsd_createargs *argp, | 201 | nfsd_proc_create(struct svc_rqst *rqstp, struct nfsd_createargs *argp, |
202 | struct nfsd_diropres *resp) | 202 | struct nfsd_diropres *resp) |
203 | { | 203 | { |
@@ -348,7 +348,7 @@ done: | |||
348 | return nfsd_return_dirop(nfserr, resp); | 348 | return nfsd_return_dirop(nfserr, resp); |
349 | } | 349 | } |
350 | 350 | ||
351 | static int | 351 | static __be32 |
352 | nfsd_proc_remove(struct svc_rqst *rqstp, struct nfsd_diropargs *argp, | 352 | nfsd_proc_remove(struct svc_rqst *rqstp, struct nfsd_diropargs *argp, |
353 | void *resp) | 353 | void *resp) |
354 | { | 354 | { |
@@ -363,7 +363,7 @@ nfsd_proc_remove(struct svc_rqst *rqstp, struct nfsd_diropargs *argp, | |||
363 | return nfserr; | 363 | return nfserr; |
364 | } | 364 | } |
365 | 365 | ||
366 | static int | 366 | static __be32 |
367 | nfsd_proc_rename(struct svc_rqst *rqstp, struct nfsd_renameargs *argp, | 367 | nfsd_proc_rename(struct svc_rqst *rqstp, struct nfsd_renameargs *argp, |
368 | void *resp) | 368 | void *resp) |
369 | { | 369 | { |
@@ -381,7 +381,7 @@ nfsd_proc_rename(struct svc_rqst *rqstp, struct nfsd_renameargs *argp, | |||
381 | return nfserr; | 381 | return nfserr; |
382 | } | 382 | } |
383 | 383 | ||
384 | static int | 384 | static __be32 |
385 | nfsd_proc_link(struct svc_rqst *rqstp, struct nfsd_linkargs *argp, | 385 | nfsd_proc_link(struct svc_rqst *rqstp, struct nfsd_linkargs *argp, |
386 | void *resp) | 386 | void *resp) |
387 | { | 387 | { |
@@ -401,7 +401,7 @@ nfsd_proc_link(struct svc_rqst *rqstp, struct nfsd_linkargs *argp, | |||
401 | return nfserr; | 401 | return nfserr; |
402 | } | 402 | } |
403 | 403 | ||
404 | static int | 404 | static __be32 |
405 | nfsd_proc_symlink(struct svc_rqst *rqstp, struct nfsd_symlinkargs *argp, | 405 | nfsd_proc_symlink(struct svc_rqst *rqstp, struct nfsd_symlinkargs *argp, |
406 | void *resp) | 406 | void *resp) |
407 | { | 407 | { |
@@ -430,7 +430,7 @@ nfsd_proc_symlink(struct svc_rqst *rqstp, struct nfsd_symlinkargs *argp, | |||
430 | * Make directory. This operation is not idempotent. | 430 | * Make directory. This operation is not idempotent. |
431 | * N.B. After this call resp->fh needs an fh_put | 431 | * N.B. After this call resp->fh needs an fh_put |
432 | */ | 432 | */ |
433 | static int | 433 | static __be32 |
434 | nfsd_proc_mkdir(struct svc_rqst *rqstp, struct nfsd_createargs *argp, | 434 | nfsd_proc_mkdir(struct svc_rqst *rqstp, struct nfsd_createargs *argp, |
435 | struct nfsd_diropres *resp) | 435 | struct nfsd_diropres *resp) |
436 | { | 436 | { |
@@ -454,7 +454,7 @@ nfsd_proc_mkdir(struct svc_rqst *rqstp, struct nfsd_createargs *argp, | |||
454 | /* | 454 | /* |
455 | * Remove a directory | 455 | * Remove a directory |
456 | */ | 456 | */ |
457 | static int | 457 | static __be32 |
458 | nfsd_proc_rmdir(struct svc_rqst *rqstp, struct nfsd_diropargs *argp, | 458 | nfsd_proc_rmdir(struct svc_rqst *rqstp, struct nfsd_diropargs *argp, |
459 | void *resp) | 459 | void *resp) |
460 | { | 460 | { |
@@ -470,7 +470,7 @@ nfsd_proc_rmdir(struct svc_rqst *rqstp, struct nfsd_diropargs *argp, | |||
470 | /* | 470 | /* |
471 | * Read a portion of a directory. | 471 | * Read a portion of a directory. |
472 | */ | 472 | */ |
473 | static int | 473 | static __be32 |
474 | nfsd_proc_readdir(struct svc_rqst *rqstp, struct nfsd_readdirargs *argp, | 474 | nfsd_proc_readdir(struct svc_rqst *rqstp, struct nfsd_readdirargs *argp, |
475 | struct nfsd_readdirres *resp) | 475 | struct nfsd_readdirres *resp) |
476 | { | 476 | { |
@@ -509,7 +509,7 @@ nfsd_proc_readdir(struct svc_rqst *rqstp, struct nfsd_readdirargs *argp, | |||
509 | /* | 509 | /* |
510 | * Get file system info | 510 | * Get file system info |
511 | */ | 511 | */ |
512 | static int | 512 | static __be32 |
513 | nfsd_proc_statfs(struct svc_rqst * rqstp, struct nfsd_fhandle *argp, | 513 | nfsd_proc_statfs(struct svc_rqst * rqstp, struct nfsd_fhandle *argp, |
514 | struct nfsd_statfsres *resp) | 514 | struct nfsd_statfsres *resp) |
515 | { | 515 | { |