From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay.sgi.com (relay1.corp.sgi.com [137.38.102.111]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id q2TJ4ES7156826 for ; Thu, 29 Mar 2012 14:04:14 -0500 Message-ID: <4F74B229.6030707@sgi.com> Date: Thu, 29 Mar 2012 14:04:09 -0500 From: Mark Tinguely MIME-Version: 1.0 Subject: Re: [PATCH 1/8] xfs: check for buffer errors before waiting References: <1333023835-12856-1-git-send-email-david@fromorbit.com> <1333023835-12856-2-git-send-email-david@fromorbit.com> In-Reply-To: <1333023835-12856-2-git-send-email-david@fromorbit.com> List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: xfs-bounces@oss.sgi.com Errors-To: xfs-bounces@oss.sgi.com To: Dave Chinner Cc: xfs@oss.sgi.com On 03/29/12 07:23, Dave Chinner wrote: > From: Dave Chinner > > If we call xfs_buf_iowait() on a buffer that failed dispatch due to > an IO error, it will wait forever for an Io that does not exist. > This is hndled in xfs_buf_read, but there is other code that calls > xfs_buf_iowait directly that doesn't. > > Rather than make the call sites have to handle checking for dispatch > errors and then checking for completion errors, make > xfs_buf_iowait() check for dispatch errors on the buffer before > waiting. This means we handle both dispatch and completion errors > with one set of error handling at the caller sites. > > Signed-off-by: Dave Chinner > --- > diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c > index 396e3bf..64ed6ff 100644 > --- a/fs/xfs/xfs_log_recover.c > +++ b/fs/xfs/xfs_log_recover.c > @@ -179,6 +179,7 @@ xlog_bread_noalign( > XFS_BUF_SET_ADDR(bp, log->l_logBBstart + blk_no); > XFS_BUF_READ(bp); > XFS_BUF_SET_COUNT(bp, BBTOB(nbblks)); > + bp->b_error = 0; > > xfsbdstrat(log->l_mp, bp); > error = xfs_buf_iowait(bp); > @@ -266,6 +267,7 @@ xlog_bwrite( > xfs_buf_hold(bp); > xfs_buf_lock(bp); > XFS_BUF_SET_COUNT(bp, BBTOB(nbblks)); > + bp->b_error = 0; > > error = xfs_bwrite(bp); > if (error) Just curious, were these needed for a particular reason? Looks good. Reviewed-by: Mark Tinguely _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs