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

Commit 29c6e486 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

[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: default avatarAdrian Bunk <bunk@stusta.de>
Cc: Eric Van Hensbergen <ericvh@ericvh.myip.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent caa9ee77

fs/9p/9p.c

+2 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ v9fs_t_clunk(struct v9fs_session_info *v9ses, u32 fid) 
	return ret;

}



#if 0

/**

 * v9fs_v9fs_t_flush - flush a pending transaction

 * @v9ses: 9P2000 session information
@@ -171,6 +172,7 @@ int v9fs_t_flush(struct v9fs_session_info *v9ses, u16 oldtag) 


	return ret;

}

#endif  /*  0  */



/**

 * v9fs_t_stat - read a file's meta-data

fs/9p/9p.h

+0 −2
Original line number Diff line number Diff line
@@ -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_flush(struct v9fs_session_info *v9ses, u16 oldtag);



int v9fs_t_stat(struct v9fs_session_info *v9ses, u32 fid,

		struct v9fs_fcall **rcall);

fs/9p/conv.c

+2 −0
Original line number Diff line number Diff line
@@ -536,6 +536,7 @@ struct v9fs_fcall *v9fs_create_tversion(u32 msize, char *version) 
	return fc;

}



#if 0

struct v9fs_fcall *v9fs_create_tauth(u32 afid, char *uname, char *aname)

{

	int size;
@@ -559,6 +560,7 @@ struct v9fs_fcall *v9fs_create_tauth(u32 afid, char *uname, char *aname) 
      error:

	return fc;

}

#endif  /*  0  */



struct v9fs_fcall *

v9fs_create_tattach(u32 fid, u32 afid, char *uname, char *aname)

fs/9p/conv.h

+0 −1
Original line number Diff line number Diff line
@@ -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);



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);

fs/9p/mux.c

+6 −5
Original line number Diff line number Diff line
@@ -143,7 +143,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;
@@ -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

 */

static inline void v9fs_poll_mux(struct v9fs_mux_data *m)

static void v9fs_poll_mux(struct v9fs_mux_data *m)

{

	int n;
@@ -762,9 +762,8 @@ static struct v9fs_req *v9fs_send_request(struct v9fs_mux_data *m, 
	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;
@@ -902,6 +901,7 @@ v9fs_mux_rpc(struct v9fs_mux_data *m, struct v9fs_fcall *tc, 
	return err;

}



#if 0

/**

 * v9fs_mux_rpcnb - sends 9P request without waiting for response.

 * @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);

	return 0;

}

#endif  /*  0  */



/**

 * v9fs_mux_cancel - cancel all pending requests with error