diff options
| -rw-r--r-- | fs/9p/9p.c | 2 | ||||
| -rw-r--r-- | fs/9p/mux.c | 12 | ||||
| -rw-r--r-- | fs/9p/v9fs.c | 2 | ||||
| -rw-r--r-- | fs/9p/v9fs.h | 3 |
4 files changed, 8 insertions, 11 deletions
diff --git a/fs/9p/9p.c b/fs/9p/9p.c index c148e6ba07e5..ea2cf9692ff4 100644 --- a/fs/9p/9p.c +++ b/fs/9p/9p.c @@ -152,7 +152,7 @@ v9fs_t_clunk(struct v9fs_session_info *v9ses, u32 fid) /** * v9fs_v9fs_t_flush - flush a pending transaction * @v9ses: 9P2000 session information - * @tag: tid to release + * @tag: tag to release * */ diff --git a/fs/9p/mux.c b/fs/9p/mux.c index e2ae60adda99..3b10a36cefdb 100644 --- a/fs/9p/mux.c +++ b/fs/9p/mux.c @@ -70,7 +70,7 @@ struct v9fs_mux_data { int msize; unsigned char *extended; struct v9fs_transport *trans; - struct v9fs_idpool tidpool; + struct v9fs_idpool tagpool; int err; wait_queue_head_t equeue; struct list_head req_list; @@ -280,8 +280,8 @@ struct v9fs_mux_data *v9fs_mux_init(struct v9fs_transport *trans, int msize, m->msize = msize; m->extended = extended; m->trans = trans; - idr_init(&m->tidpool.pool); - init_MUTEX(&m->tidpool.lock); + idr_init(&m->tagpool.pool); + init_MUTEX(&m->tagpool.lock); m->err = 0; init_waitqueue_head(&m->equeue); INIT_LIST_HEAD(&m->req_list); @@ -965,7 +965,7 @@ static u16 v9fs_mux_get_tag(struct v9fs_mux_data *m) { int tag; - tag = v9fs_get_idpool(&m->tidpool); + tag = v9fs_get_idpool(&m->tagpool); if (tag < 0) return V9FS_NOTAG; else @@ -974,6 +974,6 @@ static u16 v9fs_mux_get_tag(struct v9fs_mux_data *m) static void v9fs_mux_put_tag(struct v9fs_mux_data *m, u16 tag) { - if (tag != V9FS_NOTAG && v9fs_check_idpool(tag, &m->tidpool)) - v9fs_put_idpool(tag, &m->tidpool); + if (tag != V9FS_NOTAG && v9fs_check_idpool(tag, &m->tagpool)) + v9fs_put_idpool(tag, &m->tagpool); } diff --git a/fs/9p/v9fs.c b/fs/9p/v9fs.c index 61352491ba36..daf623cd61c5 100644 --- a/fs/9p/v9fs.c +++ b/fs/9p/v9fs.c @@ -289,7 +289,7 @@ v9fs_session_init(struct v9fs_session_info *v9ses, /* set global debug level */ v9fs_debug_level = v9ses->debug; - /* id pools that are session-dependent: FIDs and TIDs */ + /* id pools that are session-dependent: fids and tags */ idr_init(&v9ses->fidpool.pool); init_MUTEX(&v9ses->fidpool.lock); diff --git a/fs/9p/v9fs.h b/fs/9p/v9fs.h index f337da7a0eec..9f63ab8106dd 100644 --- a/fs/9p/v9fs.h +++ b/fs/9p/v9fs.h @@ -91,6 +91,3 @@ void v9fs_session_cancel(struct v9fs_session_info *v9ses); #define V9FS_DEFUSER "nobody" #define V9FS_DEFANAME "" -/* inital pool sizes for fids and tags */ -#define V9FS_START_FIDS 8192 -#define V9FS_START_TIDS 256 |