aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_vnodeops.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/xfs/xfs_vnodeops.c')
-rw-r--r--fs/xfs/xfs_vnodeops.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
index 6202a9318a76..5ed349eccb00 100644
--- a/fs/xfs/xfs_vnodeops.c
+++ b/fs/xfs/xfs_vnodeops.c
@@ -2120,7 +2120,6 @@ int xfs_rm_attempts;
2120STATIC int 2120STATIC int
2121xfs_lock_dir_and_entry( 2121xfs_lock_dir_and_entry(
2122 xfs_inode_t *dp, 2122 xfs_inode_t *dp,
2123 bhv_vname_t *dentry,
2124 xfs_inode_t *ip) /* inode of entry 'name' */ 2123 xfs_inode_t *ip) /* inode of entry 'name' */
2125{ 2124{
2126 int attempts; 2125 int attempts;
@@ -2439,7 +2438,7 @@ xfs_remove(
2439 return error; 2438 return error;
2440 } 2439 }
2441 2440
2442 error = xfs_lock_dir_and_entry(dp, dentry, ip); 2441 error = xfs_lock_dir_and_entry(dp, ip);
2443 if (error) { 2442 if (error) {
2444 REMOVE_DEBUG_TRACE(__LINE__); 2443 REMOVE_DEBUG_TRACE(__LINE__);
2445 xfs_trans_cancel(tp, cancel_flags); 2444 xfs_trans_cancel(tp, cancel_flags);
@@ -3095,7 +3094,7 @@ xfs_rmdir(
3095 * that the directory entry for the child directory inode has 3094 * that the directory entry for the child directory inode has
3096 * not changed while we were obtaining a log reservation. 3095 * not changed while we were obtaining a log reservation.
3097 */ 3096 */
3098 error = xfs_lock_dir_and_entry(dp, dentry, cdp); 3097 error = xfs_lock_dir_and_entry(dp, cdp);
3099 if (error) { 3098 if (error) {
3100 xfs_trans_cancel(tp, cancel_flags); 3099 xfs_trans_cancel(tp, cancel_flags);
3101 IRELE(cdp); 3100 IRELE(cdp);