[PATCH 12/16] nfsd4: don't inline nfsd4 compound op functions
J. Bruce Fields
bfields at fieldses.org
Fri Dec 1 14:41:18 EST 2006
From: J. Bruce Fields <bfields at fieldses.org>
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 at citi.umich.edu>
---
fs/nfsd/nfs4proc.c | 43 ++++++++++++++++++-------------------------
1 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 07a4ccb..664c6ea 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -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)
{
__be32 status;
@@ -261,7 +254,7 @@ out:
/*
* 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)
@@ -271,7 +264,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)
{
fh_put(&cstate->current_fh);
@@ -280,7 +273,7 @@ nfsd4_putfh(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, struct
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;
@@ -291,7 +284,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)
@@ -301,7 +294,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)
@@ -314,7 +307,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)
{
if (access->ac_req_access & ~NFS3_ACCESS_FULL)
@@ -324,7 +317,7 @@ nfsd4_access(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, struct
return nfsd_access(rqstp, &cstate->current_fh, &access->ac_resp_access, &access->ac_supported);
}
-static inline __be32
+static __be32
nfsd4_commit(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, struct nfsd4_commit *commit)
{
__be32 status;
@@ -423,7 +416,7 @@ nfsd4_create(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, struct
return status;
}
-static inline __be32
+static __be32
nfsd4_getattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, struct nfsd4_getattr *getattr)
{
__be32 status;
@@ -442,7 +435,7 @@ nfsd4_getattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, struc
return nfs_ok;
}
-static inline __be32
+static __be32
nfsd4_link(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
struct nfsd4_link *link)
{
@@ -474,13 +467,13 @@ nfsd4_lookupp(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate)
return nfsd_lookup(rqstp, &cstate->current_fh, "..", 2, &cstate->current_fh);
}
-static inline __be32
+static __be32
nfsd4_lookup(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, struct nfsd4_lookup *lookup)
{
return nfsd_lookup(rqstp, &cstate->current_fh, lookup->lo_name, lookup->lo_len, &cstate->current_fh);
}
-static inline __be32
+static __be32
nfsd4_read(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, struct nfsd4_read *read)
{
__be32 status;
@@ -508,7 +501,7 @@ out:
return status;
}
-static inline __be32
+static __be32
nfsd4_readdir(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, struct nfsd4_readdir *readdir)
{
u64 cookie = readdir->rd_cookie;
@@ -531,7 +524,7 @@ nfsd4_readdir(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, struc
return nfs_ok;
}
-static inline __be32
+static __be32
nfsd4_readlink(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, struct nfsd4_readlink *readlink)
{
readlink->rl_rqstp = rqstp;
@@ -539,7 +532,7 @@ nfsd4_readlink(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, stru
return nfs_ok;
}
-static inline __be32
+static __be32
nfsd4_remove(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, struct nfsd4_remove *remove)
{
__be32 status;
@@ -556,7 +549,7 @@ nfsd4_remove(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, struct
return status;
}
-static inline __be32
+static __be32
nfsd4_rename(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
struct nfsd4_rename *rename)
{
@@ -589,7 +582,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)
{
__be32 status = nfs_ok;
@@ -614,7 +607,7 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, struc
return status;
}
-static inline __be32
+static __be32
nfsd4_write(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, struct nfsd4_write *write)
{
stateid_t *stateid = &write->wr_stateid;
More information about the NFSv4
mailing list