summaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_inode.c
diff options
context:
space:
mode:
authorBrian Foster <bfoster@redhat.com>2018-07-11 22:26:33 -0700
committerDarrick J. Wong <darrick.wong@oracle.com>2018-07-11 22:26:33 -0700
commit5fdd97944ee5ae0fcdd88227224d0c2c87aa6db9 (patch)
treea0591072c0a52ff66ce245c008ad6547ff7708f8 /fs/xfs/xfs_inode.c
parent9c3bf5da80efc1d502c7ef55ea5b77628e341510 (diff)
downloadlinux-5fdd97944ee5ae0fcdd88227224d0c2c87aa6db9.tar.bz2
xfs: remove xfs_defer_init() firstblock param
All but one caller of xfs_defer_init() passes in the ->t_firstblock of the associated transaction. The one outlier is xlog_recover_process_intents(), which simply passes a dummy value because a valid pointer is required. This firstblock variable can simply be removed. At this point we could remove the xfs_defer_init() firstblock parameter and initialize ->t_firstblock directly. Even that is not necessary, however, because ->t_firstblock is automatically reinitialized in the new transaction on a transaction roll. Since xfs_defer_init() should never occur more than once on a particular transaction (since the corresponding finish will roll it), replace the reinit from xfs_defer_init() with an assert that verifies the transaction has a NULLFSBLOCK firstblock. Signed-off-by: Brian Foster <bfoster@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Diffstat (limited to 'fs/xfs/xfs_inode.c')
-rw-r--r--fs/xfs/xfs_inode.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 48d22134b06f..7b2694d3901a 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -1194,7 +1194,7 @@ xfs_create(
xfs_ilock(dp, XFS_ILOCK_EXCL | XFS_ILOCK_PARENT);
unlock_dp_on_error = true;
- xfs_defer_init(tp, &dfops, &tp->t_firstblock);
+ xfs_defer_init(tp, &dfops);
/*
* Reserve disk quota and the inode.
@@ -1448,7 +1448,7 @@ xfs_link(
goto error_return;
}
- xfs_defer_init(tp, &dfops, &tp->t_firstblock);
+ xfs_defer_init(tp, &dfops);
/*
* Handle initial link state of O_TMPFILE inode
@@ -1579,7 +1579,7 @@ xfs_itruncate_extents_flags(
ASSERT(first_unmap_block < last_block);
unmap_len = last_block - first_unmap_block + 1;
while (!done) {
- xfs_defer_init(tp, &dfops, &tp->t_firstblock);
+ xfs_defer_init(tp, &dfops);
error = xfs_bunmapi(tp, ip, first_unmap_block, unmap_len, flags,
XFS_ITRUNC_MAX_EXTENTS, &done);
if (error)
@@ -1808,7 +1808,7 @@ xfs_inactive_ifree(
xfs_ilock(ip, XFS_ILOCK_EXCL);
xfs_trans_ijoin(tp, ip, 0);
- xfs_defer_init(tp, &dfops, &tp->t_firstblock);
+ xfs_defer_init(tp, &dfops);
error = xfs_ifree(tp, ip);
if (error) {
/*
@@ -2651,7 +2651,7 @@ xfs_remove(
if (error)
goto out_trans_cancel;
- xfs_defer_init(tp, &dfops, &tp->t_firstblock);
+ xfs_defer_init(tp, &dfops);
error = xfs_dir_removename(tp, dp, name, ip->i_ino, resblks);
if (error) {
ASSERT(error != -ENOENT);
@@ -3008,7 +3008,7 @@ xfs_rename(
goto out_trans_cancel;
}
- xfs_defer_init(tp, &dfops, &tp->t_firstblock);
+ xfs_defer_init(tp, &dfops);
/* RENAME_EXCHANGE is unique from here on. */
if (flags & RENAME_EXCHANGE)