aboutsummaryrefslogtreecommitdiffstats
path: root/fs/9p/mux.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/9p/mux.c')
-rw-r--r--fs/9p/mux.c12
1 files changed, 6 insertions, 6 deletions
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 {
70 int msize; 70 int msize;
71 unsigned char *extended; 71 unsigned char *extended;
72 struct v9fs_transport *trans; 72 struct v9fs_transport *trans;
73 struct v9fs_idpool tidpool; 73 struct v9fs_idpool tagpool;
74 int err; 74 int err;
75 wait_queue_head_t equeue; 75 wait_queue_head_t equeue;
76 struct list_head req_list; 76 struct list_head req_list;
@@ -280,8 +280,8 @@ struct v9fs_mux_data *v9fs_mux_init(struct v9fs_transport *trans, int msize,
280 m->msize = msize; 280 m->msize = msize;
281 m->extended = extended; 281 m->extended = extended;
282 m->trans = trans; 282 m->trans = trans;
283 idr_init(&m->tidpool.pool); 283 idr_init(&m->tagpool.pool);
284 init_MUTEX(&m->tidpool.lock); 284 init_MUTEX(&m->tagpool.lock);
285 m->err = 0; 285 m->err = 0;
286 init_waitqueue_head(&m->equeue); 286 init_waitqueue_head(&m->equeue);
287 INIT_LIST_HEAD(&m->req_list); 287 INIT_LIST_HEAD(&m->req_list);
@@ -965,7 +965,7 @@ static u16 v9fs_mux_get_tag(struct v9fs_mux_data *m)
965{ 965{
966 int tag; 966 int tag;
967 967
968 tag = v9fs_get_idpool(&m->tidpool); 968 tag = v9fs_get_idpool(&m->tagpool);
969 if (tag < 0) 969 if (tag < 0)
970 return V9FS_NOTAG; 970 return V9FS_NOTAG;
971 else 971 else
@@ -974,6 +974,6 @@ static u16 v9fs_mux_get_tag(struct v9fs_mux_data *m)
974 974
975static void v9fs_mux_put_tag(struct v9fs_mux_data *m, u16 tag) 975static void v9fs_mux_put_tag(struct v9fs_mux_data *m, u16 tag)
976{ 976{
977 if (tag != V9FS_NOTAG && v9fs_check_idpool(tag, &m->tidpool)) 977 if (tag != V9FS_NOTAG && v9fs_check_idpool(tag, &m->tagpool))
978 v9fs_put_idpool(tag, &m->tidpool); 978 v9fs_put_idpool(tag, &m->tagpool);
979} 979}