forked from Minki/linux
[PATCH] fs/9p/: possible cleanups
- 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 <bunk@stusta.de> Cc: Eric Van Hensbergen <ericvh@ericvh.myip.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
caa9ee771d
commit
29c6e48601
@ -148,6 +148,7 @@ v9fs_t_clunk(struct v9fs_session_info *v9ses, u32 fid)
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if 0
|
||||||
/**
|
/**
|
||||||
* v9fs_v9fs_t_flush - flush a pending transaction
|
* v9fs_v9fs_t_flush - flush a pending transaction
|
||||||
* @v9ses: 9P2000 session information
|
* @v9ses: 9P2000 session information
|
||||||
@ -171,6 +172,7 @@ int v9fs_t_flush(struct v9fs_session_info *v9ses, u16 oldtag)
|
|||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
#endif /* 0 */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* v9fs_t_stat - read a file's meta-data
|
* v9fs_t_stat - read a file's meta-data
|
||||||
|
@ -348,8 +348,6 @@ int v9fs_t_attach(struct v9fs_session_info *v9ses, char *uname, char *aname,
|
|||||||
|
|
||||||
int v9fs_t_clunk(struct v9fs_session_info *v9ses, u32 fid);
|
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,
|
int v9fs_t_stat(struct v9fs_session_info *v9ses, u32 fid,
|
||||||
struct v9fs_fcall **rcall);
|
struct v9fs_fcall **rcall);
|
||||||
|
|
||||||
|
@ -536,6 +536,7 @@ struct v9fs_fcall *v9fs_create_tversion(u32 msize, char *version)
|
|||||||
return fc;
|
return fc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if 0
|
||||||
struct v9fs_fcall *v9fs_create_tauth(u32 afid, char *uname, char *aname)
|
struct v9fs_fcall *v9fs_create_tauth(u32 afid, char *uname, char *aname)
|
||||||
{
|
{
|
||||||
int size;
|
int size;
|
||||||
@ -559,6 +560,7 @@ struct v9fs_fcall *v9fs_create_tauth(u32 afid, char *uname, char *aname)
|
|||||||
error:
|
error:
|
||||||
return fc;
|
return fc;
|
||||||
}
|
}
|
||||||
|
#endif /* 0 */
|
||||||
|
|
||||||
struct v9fs_fcall *
|
struct v9fs_fcall *
|
||||||
v9fs_create_tattach(u32 fid, u32 afid, char *uname, char *aname)
|
v9fs_create_tattach(u32 fid, u32 afid, char *uname, char *aname)
|
||||||
|
@ -33,7 +33,6 @@ int v9fs_deserialize_fcall(void *buf, u32 buflen, struct v9fs_fcall *rcall,
|
|||||||
void v9fs_set_tag(struct v9fs_fcall *fc, u16 tag);
|
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_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,
|
struct v9fs_fcall *v9fs_create_tattach(u32 fid, u32 afid, char *uname,
|
||||||
char *aname);
|
char *aname);
|
||||||
struct v9fs_fcall *v9fs_create_tflush(u16 oldtag);
|
struct v9fs_fcall *v9fs_create_tflush(u16 oldtag);
|
||||||
|
11
fs/9p/mux.c
11
fs/9p/mux.c
@ -143,7 +143,7 @@ void v9fs_mux_global_exit(void)
|
|||||||
*
|
*
|
||||||
* The current implementation returns sqrt of the number of mounts.
|
* 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;
|
int n;
|
||||||
|
|
||||||
@ -384,7 +384,7 @@ v9fs_pollwait(struct file *filp, wait_queue_head_t * wait_address,
|
|||||||
/**
|
/**
|
||||||
* v9fs_poll_mux - polls a mux and schedules read or write works if necessary
|
* 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;
|
int n;
|
||||||
|
|
||||||
@ -762,9 +762,8 @@ static struct v9fs_req *v9fs_send_request(struct v9fs_mux_data *m,
|
|||||||
return req;
|
return req;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void
|
static void v9fs_mux_flush_cb(void *a, struct v9fs_fcall *tc,
|
||||||
v9fs_mux_flush_cb(void *a, struct v9fs_fcall *tc, struct v9fs_fcall *rc,
|
struct v9fs_fcall *rc, int err)
|
||||||
int err)
|
|
||||||
{
|
{
|
||||||
v9fs_mux_req_callback cb;
|
v9fs_mux_req_callback cb;
|
||||||
int tag;
|
int tag;
|
||||||
@ -902,6 +901,7 @@ v9fs_mux_rpc(struct v9fs_mux_data *m, struct v9fs_fcall *tc,
|
|||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if 0
|
||||||
/**
|
/**
|
||||||
* v9fs_mux_rpcnb - sends 9P request without waiting for response.
|
* v9fs_mux_rpcnb - sends 9P request without waiting for response.
|
||||||
* @m: mux data
|
* @m: mux data
|
||||||
@ -925,6 +925,7 @@ int v9fs_mux_rpcnb(struct v9fs_mux_data *m, struct v9fs_fcall *tc,
|
|||||||
dprintk(DEBUG_MUX, "mux %p tc %p tag %d\n", m, tc, req->tag);
|
dprintk(DEBUG_MUX, "mux %p tc %p tag %d\n", m, tc, req->tag);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
#endif /* 0 */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* v9fs_mux_cancel - cancel all pending requests with error
|
* v9fs_mux_cancel - cancel all pending requests with error
|
||||||
|
@ -50,8 +50,6 @@ void v9fs_mux_destroy(struct v9fs_mux_data *);
|
|||||||
int v9fs_mux_send(struct v9fs_mux_data *m, struct v9fs_fcall *tc);
|
int v9fs_mux_send(struct v9fs_mux_data *m, struct v9fs_fcall *tc);
|
||||||
struct v9fs_fcall *v9fs_mux_recv(struct v9fs_mux_data *m);
|
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_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_flush(struct v9fs_mux_data *m, int sendflush);
|
||||||
void v9fs_mux_cancel(struct v9fs_mux_data *m, int err);
|
void v9fs_mux_cancel(struct v9fs_mux_data *m, int err);
|
||||||
|
Loading…
Reference in New Issue
Block a user