From: Adrian Bunk - mux.c: v9fs_poll_mux() was inline but not static resuling in needless object size bloat - mux.c: remove all "inline"s: gcc should know best what to inline - #if 0 the following unused global functions: - 9p.c: v9fs_v9fs_t_flush() - conv.c: v9fs_create_tauth() - mux.c: v9fs_mux_rpcnb() Signed-off-by: Adrian Bunk Cc: Eric Van Hensbergen Signed-off-by: Andrew Morton --- fs/9p/9p.c | 2 ++ fs/9p/9p.h | 2 -- fs/9p/conv.c | 2 ++ fs/9p/conv.h | 1 - fs/9p/mux.c | 11 ++++++----- fs/9p/mux.h | 2 -- 6 files changed, 10 insertions(+), 10 deletions(-) diff -puN fs/9p/9p.c~fs-9p-possible-cleanups fs/9p/9p.c --- devel/fs/9p/9p.c~fs-9p-possible-cleanups 2006-01-29 00:11:21.000000000 -0800 +++ devel-akpm/fs/9p/9p.c 2006-01-29 00:11:21.000000000 -0800 @@ -149,6 +149,7 @@ v9fs_t_clunk(struct v9fs_session_info *v return ret; } +#if 0 /** * v9fs_v9fs_t_flush - flush a pending transaction * @v9ses: 9P2000 session information @@ -172,6 +173,7 @@ int v9fs_t_flush(struct v9fs_session_inf return ret; } +#endif /* 0 */ /** * v9fs_t_stat - read a file's meta-data diff -puN fs/9p/9p.h~fs-9p-possible-cleanups fs/9p/9p.h --- devel/fs/9p/9p.h~fs-9p-possible-cleanups 2006-01-29 00:11:21.000000000 -0800 +++ devel-akpm/fs/9p/9p.h 2006-01-29 00:11:21.000000000 -0800 @@ -348,8 +348,6 @@ int v9fs_t_attach(struct v9fs_session_in int v9fs_t_clunk(struct v9fs_session_info *v9ses, u32 fid); -int v9fs_t_flush(struct v9fs_session_info *v9ses, u16 oldtag); - int v9fs_t_stat(struct v9fs_session_info *v9ses, u32 fid, struct v9fs_fcall **rcall); diff -puN fs/9p/conv.c~fs-9p-possible-cleanups fs/9p/conv.c --- devel/fs/9p/conv.c~fs-9p-possible-cleanups 2006-01-29 00:11:21.000000000 -0800 +++ devel-akpm/fs/9p/conv.c 2006-01-29 00:11:21.000000000 -0800 @@ -526,6 +526,7 @@ struct v9fs_fcall *v9fs_create_tversion( return fc; } +#if 0 struct v9fs_fcall *v9fs_create_tauth(u32 afid, char *uname, char *aname) { int size; @@ -549,6 +550,7 @@ struct v9fs_fcall *v9fs_create_tauth(u32 error: return fc; } +#endif /* 0 */ struct v9fs_fcall * v9fs_create_tattach(u32 fid, u32 afid, char *uname, char *aname) diff -puN fs/9p/conv.h~fs-9p-possible-cleanups fs/9p/conv.h --- devel/fs/9p/conv.h~fs-9p-possible-cleanups 2006-01-29 00:11:21.000000000 -0800 +++ devel-akpm/fs/9p/conv.h 2006-01-29 00:11:21.000000000 -0800 @@ -33,7 +33,6 @@ int v9fs_deserialize_fcall(void *buf, u3 void v9fs_set_tag(struct v9fs_fcall *fc, u16 tag); struct v9fs_fcall *v9fs_create_tversion(u32 msize, char *version); -struct v9fs_fcall *v9fs_create_tauth(u32 afid, char *uname, char *aname); struct v9fs_fcall *v9fs_create_tattach(u32 fid, u32 afid, char *uname, char *aname); struct v9fs_fcall *v9fs_create_tflush(u16 oldtag); diff -puN fs/9p/mux.c~fs-9p-possible-cleanups fs/9p/mux.c --- devel/fs/9p/mux.c~fs-9p-possible-cleanups 2006-01-29 00:11:21.000000000 -0800 +++ devel-akpm/fs/9p/mux.c 2006-01-29 00:11:21.000000000 -0800 @@ -142,7 +142,7 @@ void v9fs_mux_global_exit(void) * * The current implementation returns sqrt of the number of mounts. */ -inline int v9fs_mux_calc_poll_procs(int muxnum) +static int v9fs_mux_calc_poll_procs(int muxnum) { int n; @@ -383,7 +383,7 @@ v9fs_pollwait(struct file *filp, wait_qu /** * v9fs_poll_mux - polls a mux and schedules read or write works if necessary */ -static inline void v9fs_poll_mux(struct v9fs_mux_data *m) +static void v9fs_poll_mux(struct v9fs_mux_data *m) { int n; @@ -755,9 +755,8 @@ static struct v9fs_req *v9fs_send_reques return req; } -static inline void -v9fs_mux_flush_cb(void *a, struct v9fs_fcall *tc, struct v9fs_fcall *rc, - int err) +static void v9fs_mux_flush_cb(void *a, struct v9fs_fcall *tc, + struct v9fs_fcall *rc, int err) { v9fs_mux_req_callback cb; int tag; @@ -894,6 +893,7 @@ v9fs_mux_rpc(struct v9fs_mux_data *m, st return err; } +#if 0 /** * v9fs_mux_rpcnb - sends 9P request without waiting for response. * @m: mux data @@ -917,6 +917,7 @@ int v9fs_mux_rpcnb(struct v9fs_mux_data dprintk(DEBUG_MUX, "mux %p tc %p tag %d\n", m, tc, req->tag); return 0; } +#endif /* 0 */ /** * v9fs_mux_cancel - cancel all pending requests with error diff -puN fs/9p/mux.h~fs-9p-possible-cleanups fs/9p/mux.h --- devel/fs/9p/mux.h~fs-9p-possible-cleanups 2006-01-29 00:11:21.000000000 -0800 +++ devel-akpm/fs/9p/mux.h 2006-01-29 00:11:21.000000000 -0800 @@ -50,8 +50,6 @@ void v9fs_mux_destroy(struct v9fs_mux_da int v9fs_mux_send(struct v9fs_mux_data *m, struct v9fs_fcall *tc); struct v9fs_fcall *v9fs_mux_recv(struct v9fs_mux_data *m); int v9fs_mux_rpc(struct v9fs_mux_data *m, struct v9fs_fcall *tc, struct v9fs_fcall **rc); -int v9fs_mux_rpcnb(struct v9fs_mux_data *m, struct v9fs_fcall *tc, - v9fs_mux_req_callback cb, void *a); void v9fs_mux_flush(struct v9fs_mux_data *m, int sendflush); void v9fs_mux_cancel(struct v9fs_mux_data *m, int err); _