| Message ID | 20200417150859.14734-12-bfoster@redhat.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | xfs: flush related error handling cleanups | expand |
On Fri, Apr 17, 2020 at 11:08:58AM -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@redhat.com> Looks fine. Reviewed-by: Dave Chinner <dchinner@redhat.com>
On 4/17/20 8:08 AM, 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@redhat.com> Looks ok to me Reviewed-by: Allison Collins <allison.henderson@oracle.com> > --- > 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 a7be7a9e5c1a..9088716465e7 100644 > --- a/fs/xfs/xfs_icache.c > +++ b/fs/xfs/xfs_icache.c > @@ -1118,7 +1118,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 98ee1b10d1b0..502ffe857b12 100644 > --- a/fs/xfs/xfs_inode.c > +++ b/fs/xfs/xfs_inode.c > @@ -3701,7 +3701,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 f8dd9bb8c851..b8cbd0c61ce0 100644 > --- a/fs/xfs/xfs_inode_item.c > +++ b/fs/xfs/xfs_inode_item.c > @@ -757,10 +757,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_remove(&iip->ili_item); > @@ -788,7 +787,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 *); > >
diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c index a7be7a9e5c1a..9088716465e7 100644 --- a/fs/xfs/xfs_icache.c +++ b/fs/xfs/xfs_icache.c @@ -1118,7 +1118,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 98ee1b10d1b0..502ffe857b12 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -3701,7 +3701,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 f8dd9bb8c851..b8cbd0c61ce0 100644 --- a/fs/xfs/xfs_inode_item.c +++ b/fs/xfs/xfs_inode_item.c @@ -757,10 +757,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_remove(&iip->ili_item); @@ -788,7 +787,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 *);
The stale parameter was used to control the now unused shutdown parameter of xfs_trans_ail_remove(). Signed-off-by: Brian Foster <bfoster@redhat.com> --- 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(-)