From: Latchesar Ionkov <lucho@ionkov.net>
Date: Tue, 23 Oct 2007 18:48:33 +0000 (-0500)
Subject: 9p: v9fs_vfs_rename incorrect clunk order
X-Git-Tag: v2.6.24-rc1~22^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=22150c4f0f02619c256f35db2f1ec912549b4ca5;p=linux-2.6-omap-h63xx.git

9p: v9fs_vfs_rename incorrect clunk order

In v9fs_vfs_rename function labels don't match the fids that are clunked.
The correct clunk order is clunking newdirfid first and then olddirfid next.

Signed-off-by: Latchesar Ionkov <lucho@ionkov.net>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
---

diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
index 175b4d9bf3f..23581bcb599 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;