Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7191155b authored by J.Bruce Fields's avatar J.Bruce Fields Committed by Linus Torvalds
Browse files

[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: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a4f1706a

fs/nfsd/nfs4proc.c

+18 −25
Original line number Diff line number Diff line
@@ -33,13 +33,6 @@ 
 *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

 *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

 *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 *

 * Note: some routines in this file are just trivial wrappers

 * (e.g. nfsd4_lookup()) defined solely for the sake of consistent

 * naming.  Since all such routines have been declared "inline",

 * there shouldn't be any associated overhead.  At some point in

 * the future, I might inline these "by hand" to clean up a

 * little.

 */



#include <linux/param.h>
@@ -161,7 +154,7 @@ do_open_fhandle(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_ 
}





static inline __be32

static __be32

nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,

	   struct nfsd4_open *open)

{
@@ -264,7 +257,7 @@ nfsd4_open(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
/*

 * filehandle-manipulating ops.

 */

static inline __be32

static __be32

nfsd4_getfh(struct nfsd4_compound_state *cstate, struct svc_fh **getfh)

{

	if (!cstate->current_fh.fh_dentry)
@@ -274,7 +267,7 @@ nfsd4_getfh(struct nfsd4_compound_state *cstate, struct svc_fh **getfh) 
	return nfs_ok;

}



static inline __be32

static __be32

nfsd4_putfh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,

	    struct nfsd4_putfh *putfh)

{
@@ -285,7 +278,7 @@ nfsd4_putfh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	return fh_verify(rqstp, &cstate->current_fh, 0, MAY_NOP);

}



static inline __be32

static __be32

nfsd4_putrootfh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate)

{

	__be32 status;
@@ -296,7 +289,7 @@ nfsd4_putrootfh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate) 
	return status;

}



static inline __be32

static __be32

nfsd4_restorefh(struct nfsd4_compound_state *cstate)

{

	if (!cstate->save_fh.fh_dentry)
@@ -306,7 +299,7 @@ nfsd4_restorefh(struct nfsd4_compound_state *cstate) 
	return nfs_ok;

}



static inline __be32

static __be32

nfsd4_savefh(struct nfsd4_compound_state *cstate)

{

	if (!cstate->current_fh.fh_dentry)
@@ -319,7 +312,7 @@ nfsd4_savefh(struct nfsd4_compound_state *cstate) 
/*

 * misc nfsv4 ops

 */

static inline __be32

static __be32

nfsd4_access(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,

	     struct nfsd4_access *access)

{
@@ -331,7 +324,7 @@ nfsd4_access(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
			   &access->ac_supported);

}



static inline __be32

static __be32

nfsd4_commit(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,

	     struct nfsd4_commit *commit)

{
@@ -434,7 +427,7 @@ nfsd4_create(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	return status;

}



static inline __be32

static __be32

nfsd4_getattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,

	      struct nfsd4_getattr *getattr)

{
@@ -454,7 +447,7 @@ nfsd4_getattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	return nfs_ok;

}



static inline __be32

static __be32

nfsd4_link(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,

	   struct nfsd4_link *link)

{
@@ -488,7 +481,7 @@ nfsd4_lookupp(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate) 
			   "..", 2, &cstate->current_fh);

}



static inline __be32

static __be32

nfsd4_lookup(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,

	     struct nfsd4_lookup *lookup)

{
@@ -497,7 +490,7 @@ nfsd4_lookup(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
			   &cstate->current_fh);

}



static inline __be32

static __be32

nfsd4_read(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,

	   struct nfsd4_read *read)

{
@@ -527,7 +520,7 @@ nfsd4_read(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	return status;

}



static inline __be32

static __be32

nfsd4_readdir(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,

	      struct nfsd4_readdir *readdir)

{
@@ -551,7 +544,7 @@ nfsd4_readdir(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	return nfs_ok;

}



static inline __be32

static __be32

nfsd4_readlink(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,

	       struct nfsd4_readlink *readlink)

{
@@ -560,7 +553,7 @@ nfsd4_readlink(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	return nfs_ok;

}



static inline __be32

static __be32

nfsd4_remove(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,

	     struct nfsd4_remove *remove)

{
@@ -579,7 +572,7 @@ nfsd4_remove(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	return status;

}



static inline __be32

static __be32

nfsd4_rename(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,

	     struct nfsd4_rename *rename)

{
@@ -612,7 +605,7 @@ nfsd4_rename(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	return status;

}



static inline __be32

static __be32

nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,

	      struct nfsd4_setattr *setattr)

{
@@ -639,7 +632,7 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
	return status;

}



static inline __be32

static __be32

nfsd4_write(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,

	    struct nfsd4_write *write)

{