aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ.Bruce Fields <bfields@fieldses.org>2006-12-13 03:35:29 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-13 12:05:54 -0500
commit7191155bd3abbbf62368a0528f7610741d007a58 (patch)
tree9f4b2e6306184f5c77d9284356b3056a6640338b
parenta4f1706a9bd94d0e33e853a7e9f40b2650d54fbf (diff)
[PATCH] knfsd: nfsd4: don't inline nfsd4 compound op functions
The inlining contributes to bloating the stack of nfsd4_compound, and I want to change the compound op functions to function pointers anyway. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--fs/nfsd/nfs4proc.c43
1 files changed, 18 insertions, 25 deletions
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 0972cb33d7d4..9fcf46a7d95d 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -33,13 +33,6 @@
33 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 33 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
34 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 34 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
35 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36 *
37 * Note: some routines in this file are just trivial wrappers
38 * (e.g. nfsd4_lookup()) defined solely for the sake of consistent
39 * naming. Since all such routines have been declared "inline",
40 * there shouldn't be any associated overhead. At some point in
41 * the future, I might inline these "by hand" to clean up a
42 * little.
43 */ 36 */
44 37
45#include <linux/param.h> 38#include <linux/param.h>
@@ -161,7 +154,7 @@ do_open_fhandle(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_
161} 154}
162 155
163 156
164static inline __be32 157static __be32
165nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 158nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
166 struct nfsd4_open *open) 159 struct nfsd4_open *open)
167{ 160{
@@ -264,7 +257,7 @@ out:
264/* 257/*
265 * filehandle-manipulating ops. 258 * filehandle-manipulating ops.
266 */ 259 */
267static inline __be32 260static __be32
268nfsd4_getfh(struct nfsd4_compound_state *cstate, struct svc_fh **getfh) 261nfsd4_getfh(struct nfsd4_compound_state *cstate, struct svc_fh **getfh)
269{ 262{
270 if (!cstate->current_fh.fh_dentry) 263 if (!cstate->current_fh.fh_dentry)
@@ -274,7 +267,7 @@ nfsd4_getfh(struct nfsd4_compound_state *cstate, struct svc_fh **getfh)
274 return nfs_ok; 267 return nfs_ok;
275} 268}
276 269
277static inline __be32 270static __be32
278nfsd4_putfh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 271nfsd4_putfh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
279 struct nfsd4_putfh *putfh) 272 struct nfsd4_putfh *putfh)
280{ 273{
@@ -285,7 +278,7 @@ nfsd4_putfh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
285 return fh_verify(rqstp, &cstate->current_fh, 0, MAY_NOP); 278 return fh_verify(rqstp, &cstate->current_fh, 0, MAY_NOP);
286} 279}
287 280
288static inline __be32 281static __be32
289nfsd4_putrootfh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate) 282nfsd4_putrootfh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate)
290{ 283{
291 __be32 status; 284 __be32 status;
@@ -296,7 +289,7 @@ nfsd4_putrootfh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate)
296 return status; 289 return status;
297} 290}
298 291
299static inline __be32 292static __be32
300nfsd4_restorefh(struct nfsd4_compound_state *cstate) 293nfsd4_restorefh(struct nfsd4_compound_state *cstate)
301{ 294{
302 if (!cstate->save_fh.fh_dentry) 295 if (!cstate->save_fh.fh_dentry)
@@ -306,7 +299,7 @@ nfsd4_restorefh(struct nfsd4_compound_state *cstate)
306 return nfs_ok; 299 return nfs_ok;
307} 300}
308 301
309static inline __be32 302static __be32
310nfsd4_savefh(struct nfsd4_compound_state *cstate) 303nfsd4_savefh(struct nfsd4_compound_state *cstate)
311{ 304{
312 if (!cstate->current_fh.fh_dentry) 305 if (!cstate->current_fh.fh_dentry)
@@ -319,7 +312,7 @@ nfsd4_savefh(struct nfsd4_compound_state *cstate)
319/* 312/*
320 * misc nfsv4 ops 313 * misc nfsv4 ops
321 */ 314 */
322static inline __be32 315static __be32
323nfsd4_access(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 316nfsd4_access(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
324 struct nfsd4_access *access) 317 struct nfsd4_access *access)
325{ 318{
@@ -331,7 +324,7 @@ nfsd4_access(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
331 &access->ac_supported); 324 &access->ac_supported);
332} 325}
333 326
334static inline __be32 327static __be32
335nfsd4_commit(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 328nfsd4_commit(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
336 struct nfsd4_commit *commit) 329 struct nfsd4_commit *commit)
337{ 330{
@@ -434,7 +427,7 @@ nfsd4_create(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
434 return status; 427 return status;
435} 428}
436 429
437static inline __be32 430static __be32
438nfsd4_getattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 431nfsd4_getattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
439 struct nfsd4_getattr *getattr) 432 struct nfsd4_getattr *getattr)
440{ 433{
@@ -454,7 +447,7 @@ nfsd4_getattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
454 return nfs_ok; 447 return nfs_ok;
455} 448}
456 449
457static inline __be32 450static __be32
458nfsd4_link(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 451nfsd4_link(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
459 struct nfsd4_link *link) 452 struct nfsd4_link *link)
460{ 453{
@@ -488,7 +481,7 @@ nfsd4_lookupp(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate)
488 "..", 2, &cstate->current_fh); 481 "..", 2, &cstate->current_fh);
489} 482}
490 483
491static inline __be32 484static __be32
492nfsd4_lookup(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 485nfsd4_lookup(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
493 struct nfsd4_lookup *lookup) 486 struct nfsd4_lookup *lookup)
494{ 487{
@@ -497,7 +490,7 @@ nfsd4_lookup(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
497 &cstate->current_fh); 490 &cstate->current_fh);
498} 491}
499 492
500static inline __be32 493static __be32
501nfsd4_read(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 494nfsd4_read(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
502 struct nfsd4_read *read) 495 struct nfsd4_read *read)
503{ 496{
@@ -527,7 +520,7 @@ out:
527 return status; 520 return status;
528} 521}
529 522
530static inline __be32 523static __be32
531nfsd4_readdir(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 524nfsd4_readdir(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
532 struct nfsd4_readdir *readdir) 525 struct nfsd4_readdir *readdir)
533{ 526{
@@ -551,7 +544,7 @@ nfsd4_readdir(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
551 return nfs_ok; 544 return nfs_ok;
552} 545}
553 546
554static inline __be32 547static __be32
555nfsd4_readlink(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 548nfsd4_readlink(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
556 struct nfsd4_readlink *readlink) 549 struct nfsd4_readlink *readlink)
557{ 550{
@@ -560,7 +553,7 @@ nfsd4_readlink(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
560 return nfs_ok; 553 return nfs_ok;
561} 554}
562 555
563static inline __be32 556static __be32
564nfsd4_remove(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 557nfsd4_remove(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
565 struct nfsd4_remove *remove) 558 struct nfsd4_remove *remove)
566{ 559{
@@ -579,7 +572,7 @@ nfsd4_remove(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
579 return status; 572 return status;
580} 573}
581 574
582static inline __be32 575static __be32
583nfsd4_rename(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 576nfsd4_rename(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
584 struct nfsd4_rename *rename) 577 struct nfsd4_rename *rename)
585{ 578{
@@ -612,7 +605,7 @@ nfsd4_rename(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
612 return status; 605 return status;
613} 606}
614 607
615static inline __be32 608static __be32
616nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 609nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
617 struct nfsd4_setattr *setattr) 610 struct nfsd4_setattr *setattr)
618{ 611{
@@ -639,7 +632,7 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
639 return status; 632 return status;
640} 633}
641 634
642static inline __be32 635static __be32
643nfsd4_write(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 636nfsd4_write(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
644 struct nfsd4_write *write) 637 struct nfsd4_write *write)
645{ 638{