Commit 4a26c242 authored by Russ Cox's avatar Russ Cox Committed by Linus Torvalds
Browse files

[PATCH] v9fs: rename tids to tags to be consistent with Plan 9 documentation



The code talks about these things called tids, which I eventually figured
out are tags.
Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 27979bb2
...@@ -152,7 +152,7 @@ v9fs_t_clunk(struct v9fs_session_info *v9ses, u32 fid) ...@@ -152,7 +152,7 @@ v9fs_t_clunk(struct v9fs_session_info *v9ses, u32 fid)
/** /**
* v9fs_v9fs_t_flush - flush a pending transaction * v9fs_v9fs_t_flush - flush a pending transaction
* @v9ses: 9P2000 session information * @v9ses: 9P2000 session information
* @tag: tid to release * @tag: tag to release
* *
*/ */
......
...@@ -70,7 +70,7 @@ struct v9fs_mux_data { ...@@ -70,7 +70,7 @@ struct v9fs_mux_data {
int msize; int msize;
unsigned char *extended; unsigned char *extended;
struct v9fs_transport *trans; struct v9fs_transport *trans;
struct v9fs_idpool tidpool; struct v9fs_idpool tagpool;
int err; int err;
wait_queue_head_t equeue; wait_queue_head_t equeue;
struct list_head req_list; struct list_head req_list;
...@@ -280,8 +280,8 @@ struct v9fs_mux_data *v9fs_mux_init(struct v9fs_transport *trans, int msize, ...@@ -280,8 +280,8 @@ struct v9fs_mux_data *v9fs_mux_init(struct v9fs_transport *trans, int msize,
m->msize = msize; m->msize = msize;
m->extended = extended; m->extended = extended;
m->trans = trans; m->trans = trans;
idr_init(&m->tidpool.pool); idr_init(&m->tagpool.pool);
init_MUTEX(&m->tidpool.lock); init_MUTEX(&m->tagpool.lock);
m->err = 0; m->err = 0;
init_waitqueue_head(&m->equeue); init_waitqueue_head(&m->equeue);
INIT_LIST_HEAD(&m->req_list); INIT_LIST_HEAD(&m->req_list);
...@@ -965,7 +965,7 @@ static u16 v9fs_mux_get_tag(struct v9fs_mux_data *m) ...@@ -965,7 +965,7 @@ static u16 v9fs_mux_get_tag(struct v9fs_mux_data *m)
{ {
int tag; int tag;
tag = v9fs_get_idpool(&m->tidpool); tag = v9fs_get_idpool(&m->tagpool);
if (tag < 0) if (tag < 0)
return V9FS_NOTAG; return V9FS_NOTAG;
else else
...@@ -974,6 +974,6 @@ static u16 v9fs_mux_get_tag(struct v9fs_mux_data *m) ...@@ -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) static void v9fs_mux_put_tag(struct v9fs_mux_data *m, u16 tag)
{ {
if (tag != V9FS_NOTAG && v9fs_check_idpool(tag, &m->tidpool)) if (tag != V9FS_NOTAG && v9fs_check_idpool(tag, &m->tagpool))
v9fs_put_idpool(tag, &m->tidpool); v9fs_put_idpool(tag, &m->tagpool);
} }
...@@ -289,7 +289,7 @@ v9fs_session_init(struct v9fs_session_info *v9ses, ...@@ -289,7 +289,7 @@ v9fs_session_init(struct v9fs_session_info *v9ses,
/* set global debug level */ /* set global debug level */
v9fs_debug_level = v9ses->debug; 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); idr_init(&v9ses->fidpool.pool);
init_MUTEX(&v9ses->fidpool.lock); init_MUTEX(&v9ses->fidpool.lock);
......
...@@ -91,6 +91,3 @@ void v9fs_session_cancel(struct v9fs_session_info *v9ses); ...@@ -91,6 +91,3 @@ void v9fs_session_cancel(struct v9fs_session_info *v9ses);
#define V9FS_DEFUSER "nobody" #define V9FS_DEFUSER "nobody"
#define V9FS_DEFANAME "" #define V9FS_DEFANAME ""
/* inital pool sizes for fids and tags */
#define V9FS_START_FIDS 8192
#define V9FS_START_TIDS 256
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment