Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  9p: v9fs_vfs_rename incorrect clunk order
  9p: fix memleak in fs/9p/v9fs.c
  9p: add virtio transport

2 files changed, 3 insertions, 2 deletions

diff --git a/fs/9p/v9fs.c b/fs/9p/v9fs.c
index 873802de21cd..756f7e9beb2e 100644
--- a/fs/9p/v9fs.c
+++ b/fs/9p/v9fs.c
@@ -162,6 +162,7 @@ static void v9fs_parse_options(struct v9fs_session_info *v9ses)
                                 if (*e != '\0')
                                         v9ses->uid = ~0;
                         }
+                        kfree(s);
                         break;
 
                 default:
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
index 175b4d9bf3f8..23581bcb599b 100644
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -687,10 +687,10 @@ v9fs_vfs_rename(struct inode *old_dir, struct dentry *old_dentry,
         retval = p9_client_wstat(oldfid, &wstat);
 
 clunk_newdir:
-        p9_client_clunk(olddirfid);
+        p9_client_clunk(newdirfid);
 
 clunk_olddir:
-        p9_client_clunk(newdirfid);
+        p9_client_clunk(olddirfid);
 
 done:
         return retval;