On Wed, Apr 29, 2020 at 01:21:50PM -0400, Brian Foster wrote:
> The stale parameter was used to control the now unused shutdown
> parameter of xfs_trans_ail_remove().
>
> Signed-off-by: Brian Foster <bfoster@xxxxxxxxxx>
> Reviewed-by: Dave Chinner <dchinner@xxxxxxxxxx>
> Reviewed-by: Allison Collins <allison.henderson@xxxxxxxxxx>
> Reviewed-by: Christoph Hellwig <hch@xxxxxx>
Looks good,
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
--D
> ---
> fs/xfs/xfs_icache.c | 2 +-
> fs/xfs/xfs_inode.c | 2 +-
> fs/xfs/xfs_inode_item.c | 7 +++----
> fs/xfs/xfs_inode_item.h | 2 +-
> 4 files changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
> index 8bf1d15be3f6..7032efcb6814 100644
> --- a/fs/xfs/xfs_icache.c
> +++ b/fs/xfs/xfs_icache.c
> @@ -1128,7 +1128,7 @@ xfs_reclaim_inode(
> if (XFS_FORCED_SHUTDOWN(ip->i_mount)) {
> xfs_iunpin_wait(ip);
> /* xfs_iflush_abort() drops the flush lock */
> - xfs_iflush_abort(ip, false);
> + xfs_iflush_abort(ip);
> goto reclaim;
> }
> if (xfs_ipincount(ip)) {
> diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> index 6fb3e26afa8b..e0d9a5bf7507 100644
> --- a/fs/xfs/xfs_inode.c
> +++ b/fs/xfs/xfs_inode.c
> @@ -3702,7 +3702,7 @@ xfs_iflush(
> return 0;
>
> abort:
> - xfs_iflush_abort(ip, false);
> + xfs_iflush_abort(ip);
> shutdown:
> xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE);
> return error;
> diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c
> index 1a02058178d1..cefa2484f0db 100644
> --- a/fs/xfs/xfs_inode_item.c
> +++ b/fs/xfs/xfs_inode_item.c
> @@ -762,10 +762,9 @@ xfs_iflush_done(
> */
> void
> xfs_iflush_abort(
> - xfs_inode_t *ip,
> - bool stale)
> + struct xfs_inode *ip)
> {
> - xfs_inode_log_item_t *iip = ip->i_itemp;
> + struct xfs_inode_log_item *iip = ip->i_itemp;
>
> if (iip) {
> xfs_trans_ail_delete(&iip->ili_item, 0);
> @@ -793,7 +792,7 @@ xfs_istale_done(
> struct xfs_buf *bp,
> struct xfs_log_item *lip)
> {
> - xfs_iflush_abort(INODE_ITEM(lip)->ili_inode, true);
> + xfs_iflush_abort(INODE_ITEM(lip)->ili_inode);
> }
>
> /*
> diff --git a/fs/xfs/xfs_inode_item.h b/fs/xfs/xfs_inode_item.h
> index 07a60e74c39c..a68c114b79a0 100644
> --- a/fs/xfs/xfs_inode_item.h
> +++ b/fs/xfs/xfs_inode_item.h
> @@ -34,7 +34,7 @@ extern void xfs_inode_item_init(struct xfs_inode *, struct xfs_mount *);
> extern void xfs_inode_item_destroy(struct xfs_inode *);
> extern void xfs_iflush_done(struct xfs_buf *, struct xfs_log_item *);
> extern void xfs_istale_done(struct xfs_buf *, struct xfs_log_item *);
> -extern void xfs_iflush_abort(struct xfs_inode *, bool);
> +extern void xfs_iflush_abort(struct xfs_inode *);
> extern int xfs_inode_item_format_convert(xfs_log_iovec_t *,
> struct xfs_inode_log_format *);
>
> --
> 2.21.1
>
