[V9fs-developer] Bug fix on top of Mohan's TMKNOD patch (client)

Commit Message

jvrao June 10, 2010, 7:16 p.m. UTC

None

Patch

diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
index 20326cf..3ecc3c2 100644
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -1668,8 +1668,8 @@  v9fs_vfs_mknod_dotl(struct inode *dir, struct dentry *dent
        }
 
        name = (char *) dentry->d_name.name;
-       err = p9_client_mknod_dotl(dfid, name, mode, new_encode_dev(rdev),
-                               gid, &qid);
+
+       err = p9_client_mknod_dotl(dfid, name, mode, rdev, gid, &qid);
        if (err < 0)
                goto error;
 
diff --git a/net/9p/client.c b/net/9p/client.c
index 6cb8cb6..ccdcf17 100644
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -1628,11 +1628,10 @@  int p9_client_mknod_dotl(struct p9_fid *fid, char *name,
        clnt = fid->clnt;
        P9_DPRINTK(P9_DEBUG_9P, ">>> TMKNOD fid %d name %s mode %d major %d "
                "minor %d\n", fid->fid, name, mode, MAJOR(rdev), MINOR(rdev));
-       req = p9_client_rpc(clnt, P9_TMKNOD, "dsddd", fid->fid, name, mode,
-               rdev, gid);
+       req = p9_client_rpc(clnt, P9_TMKNOD, "dsdddd", fid->fid, name, mode,
+               MAJOR(rdev), MINOR(rdev), gid);
        if (IS_ERR(req)) {
-               err = PTR_ERR(req);
-               goto error;
+               return PTR_ERR(req);
        }
 
        err = p9pdu_readf(req->rc, clnt->proto_version, "Q", qid);