diff options
| author | Brian Foster <bfoster@redhat.com> | 2013-09-20 11:06:09 -0400 |
|---|---|---|
| committer | Ben Myers <bpm@sgi.com> | 2013-10-08 14:53:02 -0500 |
| commit | 36b21dde6e899d2f25077b7c239d2d6bcff17d73 (patch) | |
| tree | 34470b5c788b4db47002d891aa7f8d065aabd3df /fs/xfs/xfs_inode.c | |
| parent | 2900a579abcea13e4e77c40f89eb16eeecb5508e (diff) | |
xfs: push down inactive transaction mgmt for remote symlinks
Push down the transaction management for remote symlinks from
xfs_inactive() down to xfs_inactive_symlink_rmt(). The latter is
cleaned up to avoid transaction management intended for the
calling context (i.e., trans duplication, reservation, item
attachment).
Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_inode.c')
| -rw-r--r-- | fs/xfs/xfs_inode.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 5ac716b2df22..c26990b50941 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -1724,9 +1724,14 @@ xfs_inactive( if (error) return VN_INACTIVE_CACHE; + if (S_ISLNK(ip->i_d.di_mode)) { + error = xfs_inactive_symlink(ip); + if (error) + goto out; + } + tp = xfs_trans_alloc(mp, XFS_TRANS_INACTIVE); - resp = (truncate || S_ISLNK(ip->i_d.di_mode)) ? - &M_RES(mp)->tr_itruncate : &M_RES(mp)->tr_ifree; + resp = truncate ? &M_RES(mp)->tr_itruncate : &M_RES(mp)->tr_ifree; error = xfs_trans_reserve(tp, resp, 0, 0); if (error) { @@ -1738,11 +1743,7 @@ xfs_inactive( xfs_ilock(ip, XFS_ILOCK_EXCL); xfs_trans_ijoin(tp, ip, 0); - if (S_ISLNK(ip->i_d.di_mode)) { - error = xfs_inactive_symlink(ip, &tp); - if (error) - goto out_cancel; - } else if (truncate) { + if (truncate) { ip->i_d.di_size = 0; xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); |