aboutsummaryrefslogtreecommitdiff
path: root/fs/xfs/xfs_inode_item.c
diff options
context:
space:
mode:
authorGravatar Brian Foster <bfoster@redhat.com> 2020-05-06 13:27:04 -0700
committerGravatar Darrick J. Wong <darrick.wong@oracle.com> 2020-05-07 08:27:48 -0700
commit2b3cf09356d54711b6afdc7694b382c379ea42c4 (patch)
treecbb5b4dce92f332a474f722b1731e32141064f2f /fs/xfs/xfs_inode_item.c
parentxfs: drop unused shutdown parameter from xfs_trans_ail_remove() (diff)
downloadlinux-2b3cf09356d54711b6afdc7694b382c379ea42c4.tar.gz
linux-2b3cf09356d54711b6afdc7694b382c379ea42c4.tar.bz2
linux-2b3cf09356d54711b6afdc7694b382c379ea42c4.zip
xfs: combine xfs_trans_ail_[remove|delete]()
Now that the functions and callers of xfs_trans_ail_[remove|delete]() have been fixed up appropriately, the only difference between the two is the shutdown behavior. There are only a few callers of the _remove() variant, so make the shutdown conditional on the parameter and combine the two functions. Suggested-by: Dave Chinner <david@fromorbit.com> Signed-off-by: Brian Foster <bfoster@redhat.com> Reviewed-by: Dave Chinner <dchinner@redhat.com> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Allison Collins <allison.henderson@oracle.com> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Diffstat (limited to 'fs/xfs/xfs_inode_item.c')
-rw-r--r--fs/xfs/xfs_inode_item.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c
index 73a37b18ab3e..664163be5778 100644
--- a/fs/xfs/xfs_inode_item.c
+++ b/fs/xfs/xfs_inode_item.c
@@ -768,7 +768,7 @@ xfs_iflush_abort(
struct xfs_inode_log_item *iip = ip->i_itemp;
if (iip) {
- xfs_trans_ail_remove(&iip->ili_item);
+ xfs_trans_ail_delete(&iip->ili_item, 0);
iip->ili_logged = 0;
/*
* Clear the ili_last_fields bits now that we know that the