From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4EAF1C433F5 for ; Mon, 18 Oct 2021 22:26:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 30FEC610FB for ; Mon, 18 Oct 2021 22:26:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229524AbhJRW2b (ORCPT ); Mon, 18 Oct 2021 18:28:31 -0400 Received: from mail110.syd.optusnet.com.au ([211.29.132.97]:36934 "EHLO mail110.syd.optusnet.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230070AbhJRW2a (ORCPT ); Mon, 18 Oct 2021 18:28:30 -0400 Received: from dread.disaster.area (pa49-195-238-16.pa.nsw.optusnet.com.au [49.195.238.16]) by mail110.syd.optusnet.com.au (Postfix) with ESMTPS id 0F4E5107702; Tue, 19 Oct 2021 09:26:15 +1100 (AEDT) Received: from dave by dread.disaster.area with local (Exim 4.92.3) (envelope-from ) id 1mcb5C-007ojG-Uj; Tue, 19 Oct 2021 09:26:14 +1100 Date: Tue, 19 Oct 2021 09:26:14 +1100 From: Dave Chinner To: "Darrick J. Wong" Cc: linux-xfs@vger.kernel.org, chandan.babu@oracle.com, hch@lst.de Subject: Re: [PATCH v4.1 01/17] xfs: fix incorrect decoding in xchk_btree_cur_fsbno Message-ID: <20211018222614.GY2361455@dread.disaster.area> References: <163424261462.756780.16294781570977242370.stgit@magnolia> <163424262046.756780.2366797746965376855.stgit@magnolia> <20211015004203.GO24307@magnolia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211015004203.GO24307@magnolia> X-Optus-CM-Score: 0 X-Optus-CM-Analysis: v=2.4 cv=e9dl9Yl/ c=1 sm=1 tr=0 ts=616df489 a=DzKKRZjfViQTE5W6EVc0VA==:117 a=DzKKRZjfViQTE5W6EVc0VA==:17 a=kj9zAlcOel0A:10 a=8gfv0ekSlNoA:10 a=VwQbUJbxAAAA:8 a=20KFwNOVAAAA:8 a=7-415B0cAAAA:8 a=FaHjbzKQ8L-E_o8YzBIA:9 a=CjuIK1q_8ugA:10 a=AjGcO6oz07-iQ99wixmX:22 a=biEYGPWJfzWAr4FL6Ov7:22 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org On Thu, Oct 14, 2021 at 05:42:03PM -0700, Darrick J. Wong wrote: > From: Darrick J. Wong > > During review of subsequent patches, Dave and I noticed that this > function doesn't work quite right -- accessing cur->bc_ino depends on > the ROOT_IN_INODE flag, not LONG_PTRS. Fix that and the parentheses > isssue. While we're at it, remove the piece that accesses cur->bc_ag, > because block 0 of an AG is never part of a btree. > > Note: This changes the btree scrubber tracepoints behavior -- if the > cursor has no buffer for a certain level, it will always report > NULLFSBLOCK. It is assumed that anyone tracing the online fsck code > will also be tracing xchk_start/xchk_done or otherwise be aware of what > exactly is being scrubbed. > > Signed-off-by: Darrick J. Wong > --- > v4.1: note the new behavior in the commit message > --- > fs/xfs/scrub/trace.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/fs/xfs/scrub/trace.c b/fs/xfs/scrub/trace.c > index c0ef53fe6611..93c13763c15e 100644 > --- a/fs/xfs/scrub/trace.c > +++ b/fs/xfs/scrub/trace.c > @@ -24,10 +24,11 @@ xchk_btree_cur_fsbno( > if (level < cur->bc_nlevels && cur->bc_bufs[level]) > return XFS_DADDR_TO_FSB(cur->bc_mp, > xfs_buf_daddr(cur->bc_bufs[level])); > - if (level == cur->bc_nlevels - 1 && cur->bc_flags & XFS_BTREE_LONG_PTRS) > + > + if (level == cur->bc_nlevels - 1 && > + (cur->bc_flags & XFS_BTREE_ROOT_IN_INODE)) > return XFS_INO_TO_FSB(cur->bc_mp, cur->bc_ino.ip->i_ino); > - if (!(cur->bc_flags & XFS_BTREE_LONG_PTRS)) > - return XFS_AGB_TO_FSB(cur->bc_mp, cur->bc_ag.pag->pag_agno, 0); > + > return NULLFSBLOCK; > } Looks good with the update to the commit message. Reviewed-by: Dave Chinner -- Dave Chinner david@fromorbit.com