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>
This commit is contained in:

committed by
Darrick J. Wong

parent
6af0479d8b
commit
2b3cf09356
@@ -96,23 +96,6 @@ void xfs_ail_update_finish(struct xfs_ail *ailp, xfs_lsn_t old_lsn)
|
||||
__releases(ailp->ail_lock);
|
||||
void xfs_trans_ail_delete(struct xfs_log_item *lip, int shutdown_type);
|
||||
|
||||
static inline void
|
||||
xfs_trans_ail_remove(
|
||||
struct xfs_log_item *lip)
|
||||
{
|
||||
struct xfs_ail *ailp = lip->li_ailp;
|
||||
xfs_lsn_t tail_lsn;
|
||||
|
||||
spin_lock(&ailp->ail_lock);
|
||||
/* xfs_ail_update_finish() drops the AIL lock */
|
||||
if (test_bit(XFS_LI_IN_AIL, &lip->li_flags)) {
|
||||
tail_lsn = xfs_ail_delete_one(ailp, lip);
|
||||
xfs_ail_update_finish(ailp, tail_lsn);
|
||||
} else {
|
||||
spin_unlock(&ailp->ail_lock);
|
||||
}
|
||||
}
|
||||
|
||||
void xfs_ail_push(struct xfs_ail *, xfs_lsn_t);
|
||||
void xfs_ail_push_all(struct xfs_ail *);
|
||||
void xfs_ail_push_all_sync(struct xfs_ail *);
|
||||
|
Reference in New Issue
Block a user