Commit 4f1aefd1 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Carlos Maiolino
Browse files

xfs: move b_li_list based retry handling to common code 



The dquot and inode version are very similar, which is expected given the
overall b_li_list logic.  The differences are that the inode version also
clears the XFS_LI_FLUSHING which is defined in common but only ever set
by the inode item, and that the dquot version takes the ail_lock over
the list iteration.  While this seems sensible given that additions and
removals from b_li_list are protected by the ail_lock, log items are
only added before buffer submission, and are only removed when completing
the buffer, so nothing can change the list when retrying a buffer.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Acked-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarCarlos Maiolino <cem@kernel.org>
parent 46eba93d

fs/xfs/xfs_buf.c

+6 −6
Original line number Diff line number Diff line
@@ -1286,6 +1286,7 @@ xfs_buf_ioend_handle_error( 
{

	struct xfs_mount	*mp = bp->b_mount;

	struct xfs_error_cfg	*cfg;

	struct xfs_log_item	*lip;



	/*

	 * If we've already shutdown the journal because of I/O errors, there's
@@ -1333,12 +1334,11 @@ xfs_buf_ioend_handle_error( 
	}



	/* Still considered a transient error. Caller will schedule retries. */

	if (bp->b_flags & _XBF_INODES)

		xfs_buf_inode_io_fail(bp);

	else if (bp->b_flags & _XBF_DQUOTS)

		xfs_buf_dquot_io_fail(bp);

	else

		ASSERT(list_empty(&bp->b_li_list));

	list_for_each_entry(lip, &bp->b_li_list, li_bio_list) {

		set_bit(XFS_LI_FAILED, &lip->li_flags);

		clear_bit(XFS_LI_FLUSHING, &lip->li_flags);

	}



	xfs_buf_ioerror(bp, 0);

	xfs_buf_relse(bp);

	return true;

fs/xfs/xfs_buf_item.h

+0 −5
Original line number Diff line number Diff line
@@ -54,17 +54,12 @@ bool xfs_buf_item_put(struct xfs_buf_log_item *); 
void	xfs_buf_item_log(struct xfs_buf_log_item *, uint, uint);

bool	xfs_buf_item_dirty_format(struct xfs_buf_log_item *);

void	xfs_buf_inode_iodone(struct xfs_buf *);

void	xfs_buf_inode_io_fail(struct xfs_buf *bp);

#ifdef CONFIG_XFS_QUOTA

void	xfs_buf_dquot_iodone(struct xfs_buf *);

void	xfs_buf_dquot_io_fail(struct xfs_buf *bp);

#else

static inline void xfs_buf_dquot_iodone(struct xfs_buf *bp)

{

}

static inline void xfs_buf_dquot_io_fail(struct xfs_buf *bp)

{

}

#endif /* CONFIG_XFS_QUOTA */

void	xfs_buf_iodone(struct xfs_buf *);

bool	xfs_buf_log_check_iovec(struct xfs_log_iovec *iovec);

fs/xfs/xfs_dquot.c

+0 −12
Original line number Diff line number Diff line
@@ -1230,18 +1230,6 @@ xfs_buf_dquot_iodone( 
	}

}



void

xfs_buf_dquot_io_fail(

	struct xfs_buf		*bp)

{

	struct xfs_log_item	*lip;



	spin_lock(&bp->b_mount->m_ail->ail_lock);

	list_for_each_entry(lip, &bp->b_li_list, li_bio_list)

		set_bit(XFS_LI_FAILED, &lip->li_flags);

	spin_unlock(&bp->b_mount->m_ail->ail_lock);

}



/* Check incore dquot for errors before we flush. */

static xfs_failaddr_t

xfs_qm_dqflush_check(

fs/xfs/xfs_inode_item.c

+0 −12
Original line number Diff line number Diff line
@@ -1039,18 +1039,6 @@ xfs_buf_inode_iodone( 
		list_splice_tail(&flushed_inodes, &bp->b_li_list);

}



void

xfs_buf_inode_io_fail(

	struct xfs_buf		*bp)

{

	struct xfs_log_item	*lip;



	list_for_each_entry(lip, &bp->b_li_list, li_bio_list) {

		set_bit(XFS_LI_FAILED, &lip->li_flags);

		clear_bit(XFS_LI_FLUSHING, &lip->li_flags);

	}

}



/*

 * Clear the inode logging fields so no more flushes are attempted.  If we are

 * on a buffer list, it is now safe to remove it because the buffer is