diff options
| author |   Dave Chinner <david@fromorbit.com> | 2014-12-04 09:46:17 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-12-04 09:46:17 +1100 |
| commit | 6044e4386cd51dece882ea42352cdaaab0f24cad (patch) | |
| tree | cde51132ea9d6afefdf05ad621fc22bbb796d5f4 /fs/xfs/xfs_inode.c | |
| parent | Merge branch 'xfs-coccinelle-cleanups' into for-next (diff) | |
| parent | xfs: split metadata and log buffer completion to separate workqueues (diff) | |
| download | linux-dev-6044e4386cd51dece882ea42352cdaaab0f24cad.tar.xz linux-dev-6044e4386cd51dece882ea42352cdaaab0f24cad.zip | |
Merge branch 'xfs-misc-fixes-for-3.19-2' into for-next
Conflicts:
fs/xfs/xfs_iops.c
Diffstat (limited to 'fs/xfs/xfs_inode.c')
| -rw-r--r-- | fs/xfs/xfs_inode.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index fb2f9008b354..41f804e740d7 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -2483,9 +2483,7 @@ xfs_remove( xfs_fsblock_t first_block; int cancel_flags; int committed; - int link_zero; uint resblks; - uint log_count; trace_xfs_remove(dp, name); @@ -2500,13 +2498,10 @@ xfs_remove( if (error) goto std_return; - if (is_dir) { + if (is_dir) tp = xfs_trans_alloc(mp, XFS_TRANS_RMDIR); - log_count = XFS_DEFAULT_LOG_COUNT; - } else { + else tp = xfs_trans_alloc(mp, XFS_TRANS_REMOVE); - log_count = XFS_REMOVE_LOG_COUNT; - } cancel_flags = XFS_TRANS_RELEASE_LOG_RES; /* @@ -2574,9 +2569,6 @@ xfs_remove( if (error) goto out_trans_cancel; - /* Determine if this is the last link while the inode is locked */ - link_zero = (ip->i_d.di_nlink == 0); - xfs_bmap_init(&free_list, &first_block); error = xfs_dir_removename(tp, dp, name, ip->i_ino, &first_block, &free_list, resblks); |