diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 12:04:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 12:04:01 -0700 |
| commit | 01e7ae8c13bb06a2ce622ebace33bb7e28ef596c (patch) | |
| tree | 3dcaf08b5268e1602c6e6bc85870ebbc2f927856 /fs/9p/vfs_inode.c | |
| parent | 117636092a87a28a013a4acb5de5492645ed620f (diff) | |
| parent | 22150c4f0f02619c256f35db2f1ec912549b4ca5 (diff) | |
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
Diffstat (limited to 'fs/9p/vfs_inode.c')
| -rw-r--r-- | fs/9p/vfs_inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |