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/nfs3proc.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/nfs3proc.c')
-rw-r--r-- | fs/nfsd/nfs3proc.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c index a5ebc7dbb384..a12663fdfe16 100644 --- a/fs/nfsd/nfs3proc.c +++ b/fs/nfsd/nfs3proc.c | |||
@@ -43,7 +43,7 @@ static int nfs3_ftypes[] = { | |||
43 | /* | 43 | /* |
44 | * NULL call. | 44 | * NULL call. |
45 | */ | 45 | */ |
46 | static int | 46 | static __be32 |
47 | nfsd3_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) | 47 | nfsd3_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) |
48 | { | 48 | { |
49 | return nfs_ok; | 49 | return nfs_ok; |
@@ -52,7 +52,7 @@ nfsd3_proc_null(struct svc_rqst *rqstp, void *argp, void *resp) | |||
52 | /* | 52 | /* |
53 | * Get a file's attributes | 53 | * Get a file's attributes |
54 | */ | 54 | */ |
55 | static int | 55 | static __be32 |
56 | nfsd3_proc_getattr(struct svc_rqst *rqstp, struct nfsd_fhandle *argp, | 56 | nfsd3_proc_getattr(struct svc_rqst *rqstp, struct nfsd_fhandle *argp, |
57 | struct nfsd3_attrstat *resp) | 57 | struct nfsd3_attrstat *resp) |
58 | { | 58 | { |
@@ -76,7 +76,7 @@ nfsd3_proc_getattr(struct svc_rqst *rqstp, struct nfsd_fhandle *argp, | |||
76 | /* | 76 | /* |
77 | * Set a file's attributes | 77 | * Set a file's attributes |
78 | */ | 78 | */ |
79 | static int | 79 | static __be32 |
80 | nfsd3_proc_setattr(struct svc_rqst *rqstp, struct nfsd3_sattrargs *argp, | 80 | nfsd3_proc_setattr(struct svc_rqst *rqstp, struct nfsd3_sattrargs *argp, |
81 | struct nfsd3_attrstat *resp) | 81 | struct nfsd3_attrstat *resp) |
82 | { | 82 | { |
@@ -94,7 +94,7 @@ nfsd3_proc_setattr(struct svc_rqst *rqstp, struct nfsd3_sattrargs *argp, | |||
94 | /* | 94 | /* |
95 | * Look up a path name component | 95 | * Look up a path name component |
96 | */ | 96 | */ |
97 | static int | 97 | static __be32 |
98 | nfsd3_proc_lookup(struct svc_rqst *rqstp, struct nfsd3_diropargs *argp, | 98 | nfsd3_proc_lookup(struct svc_rqst *rqstp, struct nfsd3_diropargs *argp, |
99 | struct nfsd3_diropres *resp) | 99 | struct nfsd3_diropres *resp) |
100 | { | 100 | { |
@@ -118,7 +118,7 @@ nfsd3_proc_lookup(struct svc_rqst *rqstp, struct nfsd3_diropargs *argp, | |||
118 | /* | 118 | /* |
119 | * Check file access | 119 | * Check file access |
120 | */ | 120 | */ |
121 | static int | 121 | static __be32 |
122 | nfsd3_proc_access(struct svc_rqst *rqstp, struct nfsd3_accessargs *argp, | 122 | nfsd3_proc_access(struct svc_rqst *rqstp, struct nfsd3_accessargs *argp, |
123 | struct nfsd3_accessres *resp) | 123 | struct nfsd3_accessres *resp) |
124 | { | 124 | { |
@@ -137,7 +137,7 @@ nfsd3_proc_access(struct svc_rqst *rqstp, struct nfsd3_accessargs *argp, | |||
137 | /* | 137 | /* |
138 | * Read a symlink. | 138 | * Read a symlink. |
139 | */ | 139 | */ |
140 | static int | 140 | static __be32 |
141 | nfsd3_proc_readlink(struct svc_rqst *rqstp, struct nfsd3_readlinkargs *argp, | 141 | nfsd3_proc_readlink(struct svc_rqst *rqstp, struct nfsd3_readlinkargs *argp, |
142 | struct nfsd3_readlinkres *resp) | 142 | struct nfsd3_readlinkres *resp) |
143 | { | 143 | { |
@@ -155,7 +155,7 @@ nfsd3_proc_readlink(struct svc_rqst *rqstp, struct nfsd3_readlinkargs *argp, | |||
155 | /* | 155 | /* |
156 | * Read a portion of a file. | 156 | * Read a portion of a file. |
157 | */ | 157 | */ |
158 | static int | 158 | static __be32 |
159 | nfsd3_proc_read(struct svc_rqst *rqstp, struct nfsd3_readargs *argp, | 159 | nfsd3_proc_read(struct svc_rqst *rqstp, struct nfsd3_readargs *argp, |
160 | struct nfsd3_readres *resp) | 160 | struct nfsd3_readres *resp) |
161 | { | 161 | { |
@@ -195,7 +195,7 @@ nfsd3_proc_read(struct svc_rqst *rqstp, struct nfsd3_readargs *argp, | |||
195 | /* | 195 | /* |
196 | * Write data to a file | 196 | * Write data to a file |
197 | */ | 197 | */ |
198 | static int | 198 | static __be32 |
199 | nfsd3_proc_write(struct svc_rqst *rqstp, struct nfsd3_writeargs *argp, | 199 | nfsd3_proc_write(struct svc_rqst *rqstp, struct nfsd3_writeargs *argp, |
200 | struct nfsd3_writeres *resp) | 200 | struct nfsd3_writeres *resp) |
201 | { | 201 | { |
@@ -223,7 +223,7 @@ nfsd3_proc_write(struct svc_rqst *rqstp, struct nfsd3_writeargs *argp, | |||
223 | * At least in theory; we'll see how it fares in practice when the | 223 | * At least in theory; we'll see how it fares in practice when the |
224 | * first reports about SunOS compatibility problems start to pour in... | 224 | * first reports about SunOS compatibility problems start to pour in... |
225 | */ | 225 | */ |
226 | static int | 226 | static __be32 |
227 | nfsd3_proc_create(struct svc_rqst *rqstp, struct nfsd3_createargs *argp, | 227 | nfsd3_proc_create(struct svc_rqst *rqstp, struct nfsd3_createargs *argp, |
228 | struct nfsd3_diropres *resp) | 228 | struct nfsd3_diropres *resp) |
229 | { | 229 | { |
@@ -265,7 +265,7 @@ nfsd3_proc_create(struct svc_rqst *rqstp, struct nfsd3_createargs *argp, | |||
265 | /* | 265 | /* |
266 | * Make directory. This operation is not idempotent. | 266 | * Make directory. This operation is not idempotent. |
267 | */ | 267 | */ |
268 | static int | 268 | static __be32 |
269 | nfsd3_proc_mkdir(struct svc_rqst *rqstp, struct nfsd3_createargs *argp, | 269 | nfsd3_proc_mkdir(struct svc_rqst *rqstp, struct nfsd3_createargs *argp, |
270 | struct nfsd3_diropres *resp) | 270 | struct nfsd3_diropres *resp) |
271 | { | 271 | { |
@@ -285,7 +285,7 @@ nfsd3_proc_mkdir(struct svc_rqst *rqstp, struct nfsd3_createargs *argp, | |||
285 | RETURN_STATUS(nfserr); | 285 | RETURN_STATUS(nfserr); |
286 | } | 286 | } |
287 | 287 | ||
288 | static int | 288 | static __be32 |
289 | nfsd3_proc_symlink(struct svc_rqst *rqstp, struct nfsd3_symlinkargs *argp, | 289 | nfsd3_proc_symlink(struct svc_rqst *rqstp, struct nfsd3_symlinkargs *argp, |
290 | struct nfsd3_diropres *resp) | 290 | struct nfsd3_diropres *resp) |
291 | { | 291 | { |
@@ -307,7 +307,7 @@ nfsd3_proc_symlink(struct svc_rqst *rqstp, struct nfsd3_symlinkargs *argp, | |||
307 | /* | 307 | /* |
308 | * Make socket/fifo/device. | 308 | * Make socket/fifo/device. |
309 | */ | 309 | */ |
310 | static int | 310 | static __be32 |
311 | nfsd3_proc_mknod(struct svc_rqst *rqstp, struct nfsd3_mknodargs *argp, | 311 | nfsd3_proc_mknod(struct svc_rqst *rqstp, struct nfsd3_mknodargs *argp, |
312 | struct nfsd3_diropres *resp) | 312 | struct nfsd3_diropres *resp) |
313 | { | 313 | { |
@@ -343,7 +343,7 @@ nfsd3_proc_mknod(struct svc_rqst *rqstp, struct nfsd3_mknodargs *argp, | |||
343 | /* | 343 | /* |
344 | * Remove file/fifo/socket etc. | 344 | * Remove file/fifo/socket etc. |
345 | */ | 345 | */ |
346 | static int | 346 | static __be32 |
347 | nfsd3_proc_remove(struct svc_rqst *rqstp, struct nfsd3_diropargs *argp, | 347 | nfsd3_proc_remove(struct svc_rqst *rqstp, struct nfsd3_diropargs *argp, |
348 | struct nfsd3_attrstat *resp) | 348 | struct nfsd3_attrstat *resp) |
349 | { | 349 | { |
@@ -363,7 +363,7 @@ nfsd3_proc_remove(struct svc_rqst *rqstp, struct nfsd3_diropargs *argp, | |||
363 | /* | 363 | /* |
364 | * Remove a directory | 364 | * Remove a directory |
365 | */ | 365 | */ |
366 | static int | 366 | static __be32 |
367 | nfsd3_proc_rmdir(struct svc_rqst *rqstp, struct nfsd3_diropargs *argp, | 367 | nfsd3_proc_rmdir(struct svc_rqst *rqstp, struct nfsd3_diropargs *argp, |
368 | struct nfsd3_attrstat *resp) | 368 | struct nfsd3_attrstat *resp) |
369 | { | 369 | { |
@@ -379,7 +379,7 @@ nfsd3_proc_rmdir(struct svc_rqst *rqstp, struct nfsd3_diropargs *argp, | |||
379 | RETURN_STATUS(nfserr); | 379 | RETURN_STATUS(nfserr); |
380 | } | 380 | } |
381 | 381 | ||
382 | static int | 382 | static __be32 |
383 | nfsd3_proc_rename(struct svc_rqst *rqstp, struct nfsd3_renameargs *argp, | 383 | nfsd3_proc_rename(struct svc_rqst *rqstp, struct nfsd3_renameargs *argp, |
384 | struct nfsd3_renameres *resp) | 384 | struct nfsd3_renameres *resp) |
385 | { | 385 | { |
@@ -401,7 +401,7 @@ nfsd3_proc_rename(struct svc_rqst *rqstp, struct nfsd3_renameargs *argp, | |||
401 | RETURN_STATUS(nfserr); | 401 | RETURN_STATUS(nfserr); |
402 | } | 402 | } |
403 | 403 | ||
404 | static int | 404 | static __be32 |
405 | nfsd3_proc_link(struct svc_rqst *rqstp, struct nfsd3_linkargs *argp, | 405 | nfsd3_proc_link(struct svc_rqst *rqstp, struct nfsd3_linkargs *argp, |
406 | struct nfsd3_linkres *resp) | 406 | struct nfsd3_linkres *resp) |
407 | { | 407 | { |
@@ -424,7 +424,7 @@ nfsd3_proc_link(struct svc_rqst *rqstp, struct nfsd3_linkargs *argp, | |||
424 | /* | 424 | /* |
425 | * Read a portion of a directory. | 425 | * Read a portion of a directory. |
426 | */ | 426 | */ |
427 | static int | 427 | static __be32 |
428 | nfsd3_proc_readdir(struct svc_rqst *rqstp, struct nfsd3_readdirargs *argp, | 428 | nfsd3_proc_readdir(struct svc_rqst *rqstp, struct nfsd3_readdirargs *argp, |
429 | struct nfsd3_readdirres *resp) | 429 | struct nfsd3_readdirres *resp) |
430 | { | 430 | { |
@@ -459,7 +459,7 @@ nfsd3_proc_readdir(struct svc_rqst *rqstp, struct nfsd3_readdirargs *argp, | |||
459 | * Read a portion of a directory, including file handles and attrs. | 459 | * Read a portion of a directory, including file handles and attrs. |
460 | * For now, we choose to ignore the dircount parameter. | 460 | * For now, we choose to ignore the dircount parameter. |
461 | */ | 461 | */ |
462 | static int | 462 | static __be32 |
463 | nfsd3_proc_readdirplus(struct svc_rqst *rqstp, struct nfsd3_readdirargs *argp, | 463 | nfsd3_proc_readdirplus(struct svc_rqst *rqstp, struct nfsd3_readdirargs *argp, |
464 | struct nfsd3_readdirres *resp) | 464 | struct nfsd3_readdirres *resp) |
465 | { | 465 | { |
@@ -517,7 +517,7 @@ nfsd3_proc_readdirplus(struct svc_rqst *rqstp, struct nfsd3_readdirargs *argp, | |||
517 | /* | 517 | /* |
518 | * Get file system stats | 518 | * Get file system stats |
519 | */ | 519 | */ |
520 | static int | 520 | static __be32 |
521 | nfsd3_proc_fsstat(struct svc_rqst * rqstp, struct nfsd_fhandle *argp, | 521 | nfsd3_proc_fsstat(struct svc_rqst * rqstp, struct nfsd_fhandle *argp, |
522 | struct nfsd3_fsstatres *resp) | 522 | struct nfsd3_fsstatres *resp) |
523 | { | 523 | { |
@@ -534,7 +534,7 @@ nfsd3_proc_fsstat(struct svc_rqst * rqstp, struct nfsd_fhandle *argp, | |||
534 | /* | 534 | /* |
535 | * Get file system info | 535 | * Get file system info |
536 | */ | 536 | */ |
537 | static int | 537 | static __be32 |
538 | nfsd3_proc_fsinfo(struct svc_rqst * rqstp, struct nfsd_fhandle *argp, | 538 | nfsd3_proc_fsinfo(struct svc_rqst * rqstp, struct nfsd_fhandle *argp, |
539 | struct nfsd3_fsinfores *resp) | 539 | struct nfsd3_fsinfores *resp) |
540 | { | 540 | { |
@@ -576,7 +576,7 @@ nfsd3_proc_fsinfo(struct svc_rqst * rqstp, struct nfsd_fhandle *argp, | |||
576 | /* | 576 | /* |
577 | * Get pathconf info for the specified file | 577 | * Get pathconf info for the specified file |
578 | */ | 578 | */ |
579 | static int | 579 | static __be32 |
580 | nfsd3_proc_pathconf(struct svc_rqst * rqstp, struct nfsd_fhandle *argp, | 580 | nfsd3_proc_pathconf(struct svc_rqst * rqstp, struct nfsd_fhandle *argp, |
581 | struct nfsd3_pathconfres *resp) | 581 | struct nfsd3_pathconfres *resp) |
582 | { | 582 | { |
@@ -619,7 +619,7 @@ nfsd3_proc_pathconf(struct svc_rqst * rqstp, struct nfsd_fhandle *argp, | |||
619 | /* | 619 | /* |
620 | * Commit a file (range) to stable storage. | 620 | * Commit a file (range) to stable storage. |
621 | */ | 621 | */ |
622 | static int | 622 | static __be32 |
623 | nfsd3_proc_commit(struct svc_rqst * rqstp, struct nfsd3_commitargs *argp, | 623 | nfsd3_proc_commit(struct svc_rqst * rqstp, struct nfsd3_commitargs *argp, |
624 | struct nfsd3_commitres *resp) | 624 | struct nfsd3_commitres *resp) |
625 | { | 625 | { |