---

yaml --- r: 124927 b: refs/heads/master c: d9424b3 h: refs/heads/master i: 124925: 501c5b0 124923: 974cbfd 124919: 85eb690 124911: 36c2bb9 124895: d773302 124863: 110aab5 124799: c3cd5b0 124671: 7acf6d8 124415: 14a62d0 123903: 85b7539 122879: b3224e7 v: v3
git-mirror · Dec 4, 2008 · b705b13 · b705b13
1 parent 656773c
commit b705b13
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d765b976c3a41faf9a73718fb8cc5833990a8ef
+refs/heads/master: d9424b3c4a1e96f87c6cfd4d8dd2f8d9bbb4dcc5
diff --git a/trunk/fs/xfs/linux-2.6/xfs_iops.c b/trunk/fs/xfs/linux-2.6/xfs_iops.c
@@ -367,21 +367,18 @@ xfs_vn_link(
 	struct inode	*dir,
 	struct dentry	*dentry)
 {
-	struct inode	*inode;	/* inode of guy being linked to */
+	struct inode	*inode = old_dentry->d_inode;
 	struct xfs_name	name;
 	int		error;
 
-	inode = old_dentry->d_inode;
 	xfs_dentry_to_name(&name, dentry);
 
-	igrab(inode);
 	error = xfs_link(XFS_I(dir), XFS_I(inode), &name);
-	if (unlikely(error)) {
-		iput(inode);
+	if (unlikely(error))
 		return -error;
-	}
 
 	xfs_iflags_set(XFS_I(dir), XFS_IMODIFIED);
+	atomic_inc(&inode->i_count);
 	d_instantiate(dentry, inode);
 	return 0;
 }