From b705b13ea68f6eaf64b3148df179ea14f1d659f9 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Wed, 3 Dec 2008 12:20:27 +0100 Subject: [PATCH] --- yaml --- r: 124927 b: refs/heads/master c: d9424b3c4a1e96f87c6cfd4d8dd2f8d9bbb4dcc5 h: refs/heads/master i: 124925: 501c5b047c9f96fa132dbb16779dd03c588060c4 124923: 974cbfd81c0e8c2bb808778800b4d0d736097ec5 124919: 85eb6904a2b5d3d7aa0d560c3d91e6bcedc39c12 124911: 36c2bb9b355695cd28e6d7f897bb5e39d822e07e 124895: d773302bcea13211763ac6be06051166ee6e2863 124863: 110aab591a9dfaa5196198afceee0ca0de630370 124799: c3cd5b02503cb1f9e1e1acdf3747f957c1da7374 124671: 7acf6d8e7086fd7ce4edbe22b91006d20f564c30 124415: 14a62d04d72cd351ee77462b909e1419f120848b 123903: 85b7539ed3a0ddff9ae94a6a53567e1135b2094c 122879: b3224e7a67c3a427e66fac19d63da08dfe2ae7e8 v: v3 --- [refs] | 2 +- trunk/fs/xfs/linux-2.6/xfs_iops.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 4ac2f17483b9..f5634125870d 100644 --- 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 index 2903faf6a26a..76b570dd1ab2 100644 --- 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; }