From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (8.14.3/8.14.3/SuSE Linux 0.8) with ESMTP id q48GPvlQ209795 for ; Tue, 8 May 2012 11:25:57 -0500 Date: Tue, 8 May 2012 11:29:42 -0500 From: Ben Myers Subject: Re: [PATCH 3/3] xfs: prevent needless mount warning causing test failures Message-ID: <20120508162942.GK16881@sgi.com> References: <1335519922-14371-1-git-send-email-david@fromorbit.com> <1335519922-14371-4-git-send-email-david@fromorbit.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1335519922-14371-4-git-send-email-david@fromorbit.com> List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xfs-bounces@oss.sgi.com Errors-To: xfs-bounces@oss.sgi.com To: Dave Chinner Cc: xfs@oss.sgi.com On Fri, Apr 27, 2012 at 07:45:22PM +1000, Dave Chinner wrote: > From: Dave Chinner > > Often mounting small filesystem with small logs will emit a warning > such as: > > XFS (vdb): Invalid block length (0x2000) for buffer > > during log recovery. This causes tests to randomly fail because this > output causes the clean filesystem checks on test completion to > think the filesystem is inconsistent. > > The cause of the error is simply that log recovery is asking for a > buffer size that is larger than the log when zeroing the tail. This > is because the buffer size is rounded up, and if the right head and > tail conditions exist then the buffer size can be larger than the log. > Limit the variable size xlog_get_bp() callers to requesting buffers > smaller than the log. > > Signed-off-by: Dave Chinner > --- > fs/xfs/xfs_log_recover.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c > index d7abe5f..ca38690 100644 > --- a/fs/xfs/xfs_log_recover.c > +++ b/fs/xfs/xfs_log_recover.c > @@ -441,6 +441,8 @@ xlog_find_verify_cycle( > * a log sector, or we're out of luck. > */ > bufblks = 1 << ffs(nbblks); > + while (bufblks > log->l_logBBsize) > + bufblks >>= 1; AFAICS you don't need a loop here. The following would be sufficient to make xlog_buf_bbcount_valid return 0. if (bufblks > log->l_logBBsize) bufblks = log->l_logBBsize; It is a bit more obviously correct. -Ben _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs