Commit 73f6aa4d authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

Fix barrier fail detection in XFS 



Currently we disable barriers as soon as we get a buffer in xlog_iodone
that has the XBF_ORDERED flag cleared.  But this can be the case not only
for buffers where the barrier failed, but also the first buffer of a
split log write in case of a log wraparound.  Due to the disabled
barriers we can easily get directory corruption on unclean shutdowns.
So instead of using this check add a new buffer flag for failed barrier
writes.

This is a regression vs 2.6.26 caused by patch to use the right macro
to check for the ORDERED flag, as we previously got true returned for
every buffer.

Thanks to Toei Rei for reporting the bug.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarEric Sandeen <sandeen@sandeen.net>
Reviewed-by: default avatarDavid Chinner <david@fromorbit.com>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 445e1ced

fs/xfs/linux-2.6/xfs_buf.c

+2 −1
Original line number Diff line number Diff line
@@ -1001,12 +1001,13 @@ xfs_buf_iodone_work( 
	 * We can get an EOPNOTSUPP to ordered writes.  Here we clear the

	 * ordered flag and reissue them.  Because we can't tell the higher

	 * layers directly that they should not issue ordered I/O anymore, they

	 * need to check if the ordered flag was cleared during I/O completion.

	 * need to check if the _XFS_BARRIER_FAILED flag was set during I/O completion.

	 */

	if ((bp->b_error == EOPNOTSUPP) &&

	    (bp->b_flags & (XBF_ORDERED|XBF_ASYNC)) == (XBF_ORDERED|XBF_ASYNC)) {

		XB_TRACE(bp, "ordered_retry", bp->b_iodone);

		bp->b_flags &= ~XBF_ORDERED;

		bp->b_flags |= _XFS_BARRIER_FAILED;

		xfs_buf_iorequest(bp);

	} else if (bp->b_iodone)

		(*(bp->b_iodone))(bp);

fs/xfs/linux-2.6/xfs_buf.h

+8 −0
Original line number Diff line number Diff line
@@ -85,6 +85,14 @@ typedef enum { 
	 * modifications being lost.

	 */

	_XBF_PAGE_LOCKED = (1 << 22),



	/*

	 * If we try a barrier write, but it fails we have to communicate

	 * this to the upper layers.  Unfortunately b_error gets overwritten

	 * when the buffer is re-issued so we have to add another flag to

	 * keep this information.

	 */

	_XFS_BARRIER_FAILED = (1 << 23),

} xfs_buf_flags_t;



typedef enum {

fs/xfs/xfs_log.c

+4 −3
Original line number Diff line number Diff line
@@ -1033,11 +1033,12 @@ xlog_iodone(xfs_buf_t *bp) 
	l = iclog->ic_log;



	/*

	 * If the ordered flag has been removed by a lower

	 * layer, it means the underlyin device no longer supports

	 * If the _XFS_BARRIER_FAILED flag was set by a lower

	 * layer, it means the underlying device no longer supports

	 * barrier I/O. Warn loudly and turn off barriers.

	 */

	if ((l->l_mp->m_flags & XFS_MOUNT_BARRIER) && !XFS_BUF_ISORDERED(bp)) {

	if (bp->b_flags & _XFS_BARRIER_FAILED) {

		bp->b_flags &= ~_XFS_BARRIER_FAILED;

		l->l_mp->m_flags &= ~XFS_MOUNT_BARRIER;

		xfs_fs_cmn_err(CE_WARN, l->l_mp,

				"xlog_iodone: Barriers are no longer supported"

CRA Git | Maintained and supported by SUSTech CRA and CCSE