]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
9p: v9fs_vfs_rename incorrect clunk order
authorLatchesar Ionkov <lucho@ionkov.net>
Tue, 23 Oct 2007 18:48:33 +0000 (13:48 -0500)
committerEric Van Hensbergen <ericvh@gmail.com>
Tue, 23 Oct 2007 18:48:33 +0000 (13:48 -0500)
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>
fs/9p/vfs_inode.c

index 175b4d9bf3f88af4059caaa368aac3ad761abd37..23581bcb599b2f7d6031644de612742512e218e3 100644 (file)
@@ -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;