From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f67.google.com ([209.85.221.67]:38528 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729448AbfABMje (ORCPT ); Wed, 2 Jan 2019 07:39:34 -0500 Received: by mail-wr1-f67.google.com with SMTP id v13so30340300wrw.5 for ; Wed, 02 Jan 2019 04:39:33 -0800 (PST) Date: Wed, 2 Jan 2019 13:39:29 +0100 From: Carlos Maiolino Subject: Re: [PATCH 1/8] xfs: never try to scrub more than 64 inodes per inobt record Message-ID: <20190102123929.n3errbeyyc2mctgu@hades.usersys.redhat.com> References: <154630850739.14372.14000129432637481206.stgit@magnolia> <154630851366.14372.14057534574140159776.stgit@magnolia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <154630851366.14372.14057534574140159776.stgit@magnolia> Sender: linux-xfs-owner@vger.kernel.org List-ID: List-Id: xfs To: "Darrick J. Wong" Cc: linux-xfs@vger.kernel.org On Mon, Dec 31, 2018 at 06:08:33PM -0800, Darrick J. Wong wrote: > From: Darrick J. Wong > > Make sure we never check more than XFS_INODES_PER_CHUNK inodes for any > given inobt record since there can be more than one inobt record mapped > to an inode cluster. > > Signed-off-by: Darrick J. Wong > --- > fs/xfs/scrub/ialloc.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > > diff --git a/fs/xfs/scrub/ialloc.c b/fs/xfs/scrub/ialloc.c > index 882dc56c5c21..fd431682db0b 100644 > --- a/fs/xfs/scrub/ialloc.c > +++ b/fs/xfs/scrub/ialloc.c > @@ -203,7 +203,8 @@ xchk_iallocbt_check_freemask( > int error = 0; > > /* Make sure the freemask matches the inode records. */ > - nr_inodes = mp->m_inodes_per_cluster; > + nr_inodes = min_t(unsigned int, XFS_INODES_PER_CHUNK, > + mp->m_inodes_per_cluster); Pardon me if this doesn't make sense, but, this looks like a good time to catch a possible corruption?! If mp->m_inodes_per_cluster is > XFS_INODES_PER_CHUNK something is terribly wrong and we could report it here instead of max it out to XFS_INODES_PER_CHUNK, but I haven't studied the scrub code that deep yet to see if my suggestion makes sense or not :) > > for (agino = irec->ir_startino; > agino < irec->ir_startino + XFS_INODES_PER_CHUNK; > -- Carlos