korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-18 17:54:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

[XFS] kill parent == child checks in xfs_remove and xfs_rmdir

Browse Source 
VFS guaranteed these can't happen.

SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30911a

Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
This commit is contained in:
Christoph Hellwig 2008-04-22 17:34:18 +10:00 committed by Lachlan McIlroy
parent 1ac74e01df
commit 82dab941a1
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fs/xfs/xfs_vnodeops.c
View File

@ -2180,7 +2180,7 @@ xfs_remove(
xfs_itrace_ref(ip); xfs_itrace_ref(ip);
error = XFS_QM_DQATTACH(mp, dp, 0); error = XFS_QM_DQATTACH(mp, dp, 0);
if (!error && dp != ip) if (!error)
error = XFS_QM_DQATTACH(mp, ip, 0); error = XFS_QM_DQATTACH(mp, ip, 0);
if (error) { if (error) {
REMOVE_DEBUG_TRACE(__LINE__); REMOVE_DEBUG_TRACE(__LINE__);
@ -2228,15 +2228,9 @@ xfs_remove(
* inodes locked. * inodes locked.
*/ */
xfs_trans_ijoin(tp, dp, XFS_ILOCK_EXCL); xfs_trans_ijoin(tp, dp, XFS_ILOCK_EXCL);
if (dp != ip) {
/*
* Increment vnode ref count only in this case since
* there's an extra vnode reference in the case where
* dp == ip.
*/
IHOLD(dp); IHOLD(dp);
xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL); xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);
}
/* /*
* Entry must exist since we did a lookup in xfs_lock_dir_and_entry. * Entry must exist since we did a lookup in xfs_lock_dir_and_entry.
@ -2747,7 +2741,7 @@ xfs_rmdir(
* Get the dquots for the inodes. * Get the dquots for the inodes.
*/ */
error = XFS_QM_DQATTACH(mp, dp, 0); error = XFS_QM_DQATTACH(mp, dp, 0);
if (!error && dp != cdp) if (!error)
error = XFS_QM_DQATTACH(mp, cdp, 0); error = XFS_QM_DQATTACH(mp, cdp, 0);
if (error) { if (error) {
IRELE(cdp); IRELE(cdp);
@ -2796,14 +2790,7 @@ xfs_rmdir(
} }
xfs_trans_ijoin(tp, dp, XFS_ILOCK_EXCL); xfs_trans_ijoin(tp, dp, XFS_ILOCK_EXCL);
if (dp != cdp) {
/*
* Only increment the parent directory vnode count if
* we didn't bump it in looking up cdp. The only time
* we don't bump it is when we're looking up ".".
*/
VN_HOLD(dir_vp); VN_HOLD(dir_vp);
}
xfs_itrace_ref(cdp); xfs_itrace_ref(cdp);
xfs_trans_ijoin(tp, cdp, XFS_ILOCK_EXCL); xfs_trans_ijoin(tp, cdp, XFS_ILOCK_EXCL);