remove NFSD_OPTIMIZE_SPACE
PATCH 1/1 remove NFSD_OPTIMIZE_SPACE
This patch removes the unused NFSD_OPTIMIZE_SPACE.
Additionally, it does differently what NFSD_OPTIMIZE_SPACE was supposed to do:
Nowadays, gcc knows best when to inline code, and CONFIG_CC_OPTIMIZE_FOR_SIZE even tells gcc globally whether to optimize for size or for speed. Therefore, this patch also removes all inline's from these files.
Signed-off-by Adrian Bunk <[email protected]>
---
This patch was already sent on:
- 22 Nov 2006
fs/nfsd/nfs3xdr.c | 24 ++++++++++-------------- fs/nfsd/nfsxdr.c | 13 ++++--------- 2 files changed, 14 insertions(+), 23 deletions(-)
fs/nfsd/nfs3xdr.c renamed from fs/nfsd/nfs3xdr.c.old +10 -14
@@ -24,10 +24,6 @@#define NFSDDBG_FACILITY NFSDDBG_XDR -#ifdef NFSD_OPTIMIZE_SPACE -# define inline -#endif -/* * Mapping of S_IF* types to NFS file types
@@ -42,14 +38,14 @@ static u32 nfs3_ftypes[] = {/* * XDR functions for basic NFS types */ -static inline __be32 * +static __be32 *encode_time3 (__be32 *p,struct timespec *time) { *p++ =htonl ((u32 ) time->tv_sec); *p++ =htonl (time->tv_nsec);return p; } -static inline __be32 * +static __be32 *decode_time3 (__be32 *p,struct timespec *time) { time->tv_sec =ntohl (*p++);
@@ -57,7 +53,7 @@ decode_time3(__be32 *p, struct timespecreturn p; } -static inline __be32 * +static __be32 *decode_fh (__be32 *p,struct svc_fh *fhp) {unsigned int size;
@@ -77,7 +73,7 @@ __be32 *nfs3svc_decode_fh(__be32 *p, strreturn decode_fh (p, fhp); } -static inline __be32 * +static __be32 *encode_fh (__be32 *p,struct svc_fh *fhp) {unsigned int size = fhp->fh_handle.fh_size;
@@ -91,7 +87,7 @@ encode_fh(__be32 *p, struct svc_fh *fhp)* Decode a file name and make sure that the path contains * no slashes or null bytes. */ -static inline __be32 * +static __be32 *decode_filename (__be32 *p,char **namp,int *lenp) {char *name;
@@ -107,7 +103,7 @@ decode_filename(__be32 *p, char **namp,return p; } -static inline __be32 * +static __be32 *decode_sattr3 (__be32 *p,struct iattr *iap) {u32 tmp;
@@ -153,7 +149,7 @@ decode_sattr3(__be32 *p, struct iattr *ireturn p; } -static inline __be32 * +static __be32 *encode_fattr3 (struct svc_rqst *rqstp,__be32 *p,struct svc_fh *fhp,struct kstat *stat) {
@@ -186,7 +182,7 @@ encode_fattr3(struct svc_rqst *rqstp, __return p; } -static inline __be32 * +static __be32 *encode_saved_post_attr (struct svc_rqst *rqstp,__be32 *p,struct svc_fh *fhp) {struct inode *inode = fhp->fh_dentry->d_inode;
@@ -776,7 +772,7 @@ nfs3svc_encode_readdirres(struct svc_rqsreturn xdr_ressize_check (rqstp, p); } -static inline __be32 * +static __be32 *encode_entry_baggage (struct nfsd3_readdirres *cd,__be32 *p,const char *name,int namlen,ino_t ino) {
@@ -790,7 +786,7 @@ encode_entry_baggage(struct nfsd3_readdireturn p; } -static inline __be32 * +static __be32 *encode_entryplus_baggage (struct nfsd3_readdirres *cd,__be32 *p,struct svc_fh *fhp) {
fs/nfsd/nfsxdr.c renamed from fs/nfsd/nfsxdr.c.old +4 -9
@@ -18,11 +18,6 @@#define NFSDDBG_FACILITY NFSDDBG_XDR - -#ifdef NFSD_OPTIMIZE_SPACE -# define inline -#endif -/* * Mapping of S_IF* types to NFS file types */
@@ -55,7 +50,7 @@ __be32 *nfs2svc_decode_fh(__be32 *p, strreturn decode_fh (p, fhp); } -static inline __be32 * +static __be32 *encode_fh (__be32 *p,struct svc_fh *fhp) {memcpy (p, &fhp->fh_handle.fh_base,NFS_FHSIZE );
@@ -66,7 +61,7 @@ encode_fh(__be32 *p, struct svc_fh *fhp)* Decode a file name and make sure that the path contains * no slashes or null bytes. */ -static inline __be32 * +static __be32 *decode_filename (__be32 *p,char **namp,int *lenp) {char *name;
@@ -82,7 +77,7 @@ decode_filename(__be32 *p, char **namp,return p; } -static inline __be32 * +static __be32 *decode_pathname (__be32 *p,char **namp,int *lenp) {char *name;
@@ -98,7 +93,7 @@ decode_pathname(__be32 *p, char **namp,return p; } -static inline __be32 * +static __be32 *decode_sattr (__be32 *p,struct iattr *iap) {u32 tmp, tmp1;