summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2010-10-27 17:00:08 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2010-10-29 10:14:48 +0200
commita4118ee1d80b527c385cadd14db79559efb8a493 (patch)
tree0402b0585fd9e50f54f87f06e467cad44f992efc
parentMerge branch 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linu... (diff)
downloadlinux-a4118ee1d80b527c385cadd14db79559efb8a493.tar.xz
linux-a4118ee1d80b527c385cadd14db79559efb8a493.zip
a couple of open-coded ihold() introduced by nfs merge
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/nfs/unlink.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/unlink.c b/fs/nfs/unlink.c
index 9a16bad5d2ea..7bdec8531400 100644
--- a/fs/nfs/unlink.c
+++ b/fs/nfs/unlink.c
@@ -444,9 +444,9 @@ nfs_async_rename(struct inode *old_dir, struct inode *new_dir,
/* set up nfs_renamedata */
data->old_dir = old_dir;
- atomic_inc(&old_dir->i_count);
+ ihold(old_dir);
data->new_dir = new_dir;
- atomic_inc(&new_dir->i_count);
+ ihold(new_dir);
data->old_dentry = dget(old_dentry);
data->new_dentry = dget(new_dentry);
nfs_fattr_init(&data->old_fattr);