2 files changed, 34 insertions, 8 deletions

diff --git a/net/9p/client.c b/net/9p/client.c
index e1610125a882..d83cc1247f1e 100644
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -146,7 +146,7 @@ void p9_client_disconnect(struct p9_client *clnt)
 EXPORT_SYMBOL(p9_client_disconnect);
 
 struct p9_fid *p9_client_attach(struct p9_client *clnt, struct p9_fid *afid,
-        char *uname, char *aname)
+        char *uname, u32 n_uname, char *aname)
 {
         int err;
         struct p9_fcall *tc, *rc;
@@ -165,7 +165,8 @@ struct p9_fid *p9_client_attach(struct p9_client *clnt, struct p9_fid *afid,
                 goto error;
         }
 
-        tc = p9_create_tattach(fid->fid, afid?afid->fid:P9_NOFID, uname, aname);
+        tc = p9_create_tattach(fid->fid, afid?afid->fid:P9_NOFID, uname, aname,
+                n_uname, clnt->dotu);
         if (IS_ERR(tc)) {
                 err = PTR_ERR(tc);
                 tc = NULL;
@@ -190,7 +191,8 @@ error:
 }
 EXPORT_SYMBOL(p9_client_attach);
 
-struct p9_fid *p9_client_auth(struct p9_client *clnt, char *uname, char *aname)
+struct p9_fid *p9_client_auth(struct p9_client *clnt, char *uname,
+        u32 n_uname, char *aname)
 {
         int err;
         struct p9_fcall *tc, *rc;
@@ -209,7 +211,7 @@ struct p9_fid *p9_client_auth(struct p9_client *clnt, char *uname, char *aname)
                 goto error;
         }
 
-        tc = p9_create_tauth(fid->fid, uname, aname);
+        tc = p9_create_tauth(fid->fid, uname, aname, n_uname, clnt->dotu);
         if (IS_ERR(tc)) {
                 err = PTR_ERR(tc);
                 tc = NULL;
diff --git a/net/9p/conv.c b/net/9p/conv.c
index d979d958ea19..aa2aa9884f95 100644
--- a/net/9p/conv.c
+++ b/net/9p/conv.c
@@ -547,7 +547,8 @@ error:
 }
 EXPORT_SYMBOL(p9_create_tversion);
 
-struct p9_fcall *p9_create_tauth(u32 afid, char *uname, char *aname)
+struct p9_fcall *p9_create_tauth(u32 afid, char *uname, char *aname,
+        u32 n_uname, int dotu)
 {
         int size;
         struct p9_fcall *fc;
@@ -555,7 +556,16 @@ struct p9_fcall *p9_create_tauth(u32 afid, char *uname, char *aname)
         struct cbuf *bufp = &buffer;
 
         /* afid[4] uname[s] aname[s] */
-        size = 4 + 2 + strlen(uname) + 2 + strlen(aname);
+        size = 4 + 2 + 2;
+        if (uname)
+                size += strlen(uname);
+
+        if (aname)
+                size += strlen(aname);
+
+        if (dotu)
+                size += 4;      /* n_uname */
+
         fc = p9_create_common(bufp, size, P9_TAUTH);
         if (IS_ERR(fc))
                 goto error;
@@ -563,6 +573,8 @@ struct p9_fcall *p9_create_tauth(u32 afid, char *uname, char *aname)
         p9_put_int32(bufp, afid, &fc->params.tauth.afid);
         p9_put_str(bufp, uname, &fc->params.tauth.uname);
         p9_put_str(bufp, aname, &fc->params.tauth.aname);
+        if (dotu)
+                p9_put_int32(bufp, n_uname, &fc->params.tauth.n_uname);
 
         if (buf_check_overflow(bufp)) {
                 kfree(fc);
@@ -574,7 +586,8 @@ error:
 EXPORT_SYMBOL(p9_create_tauth);
 
 struct p9_fcall *
-p9_create_tattach(u32 fid, u32 afid, char *uname, char *aname)
+p9_create_tattach(u32 fid, u32 afid, char *uname, char *aname,
+        u32 n_uname, int dotu)
 {
         int size;
         struct p9_fcall *fc;
@@ -582,7 +595,16 @@ p9_create_tattach(u32 fid, u32 afid, char *uname, char *aname)
         struct cbuf *bufp = &buffer;
 
         /* fid[4] afid[4] uname[s] aname[s] */
-        size = 4 + 4 + 2 + strlen(uname) + 2 + strlen(aname);
+        size = 4 + 4 + 2 + 2;
+        if (uname)
+                size += strlen(uname);
+
+        if (aname)
+                size += strlen(aname);
+
+        if (dotu)
+                size += 4;      /* n_uname */
+
         fc = p9_create_common(bufp, size, P9_TATTACH);
         if (IS_ERR(fc))
                 goto error;
@@ -591,6 +613,8 @@ p9_create_tattach(u32 fid, u32 afid, char *uname, char *aname)
         p9_put_int32(bufp, afid, &fc->params.tattach.afid);
         p9_put_str(bufp, uname, &fc->params.tattach.uname);
         p9_put_str(bufp, aname, &fc->params.tattach.aname);
+        if (dotu)
+                p9_put_int32(bufp, n_uname, &fc->params.tattach.n_uname);
 
 error:
         return fc;