Linux-XFS Archive on lore.kernel.org
 help / color / Atom feed
From: Dave Chinner <david@fromorbit.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: linux-xfs@vger.kernel.org, hch@infradead.org
Subject: Re: [PATCH 2/2] xfs: convert open coded corruption check to use XFS_IS_CORRUPT
Date: Sun, 10 Nov 2019 13:49:19 +1100
Message-ID: <20191110024919.GJ4614@dread.disaster.area> (raw)
In-Reply-To: <20191110001803.GP6219@magnolia>

On Sat, Nov 09, 2019 at 04:18:03PM -0800, Darrick J. Wong wrote:
> On Sun, Nov 10, 2019 at 09:32:38AM +1100, Dave Chinner wrote:
> > On Thu, Nov 07, 2019 at 11:05:21PM -0800, Darrick J. Wong wrote:
> > > From: Darrick J. Wong <darrick.wong@oracle.com>
> > > -		if (unlikely(
> > > -		       be32_to_cpu(sib_info->back) != last_blkno ||
> > > -		       sib_info->magic != dead_info->magic)) {
> > > -			XFS_ERROR_REPORT("xfs_da_swap_lastblock(3)",
> > > -					 XFS_ERRLEVEL_LOW, mp);
> > > +		if (XFS_IS_CORRUPT(mp,
> > > +		    be32_to_cpu(sib_info->back) != last_blkno ||
> > > +		    sib_info->magic != dead_info->magic)) {
> 
> They're both ugly, IMHO.  One has horrible indentation that's too close
> to the code in the if statement body, the other is hard to read as an if
> statement.

I was more commenting on the new code. The old code is horrible,
yes, but I don't think the new code is much better. :(

> > >  			error = -EFSCORRUPTED;
> > >  			goto done;
> > >  		}
> > 
> > This is kind of what I mean - is it two or three  logic statments
> > here? No, it's actually one, but it has two nested checks...
> > 
> > There's a few other list this that are somewhat non-obvious as to
> > the logic...
> 
> I'd thought about giving it the shortest name possible, not bothering to
> log the fsname that goes with the error report, and making the if part
> of the macro:
> 
> #define IFBAD(cond) if ((unlikely(cond) ? assert(...), true : false))
> 
> IFBAD(be32_to_cpu(sib_info->back) != last_blkno ||
>       sib_info->magic != dead_info->magic)) {
> 	xfs_whatever();
> 	return -EFSCORRUPTED;
> }
> 
> Is that better?

Look at what quoting did to it - it'll look the same as above in
patches, unfortunately, so I don't think "short as possible" works
any better.

Perhaps s/IFBAD/XFS_CORRUPT_IF/ ?

		XFS_CORRUPT_IF(be32_to_cpu(sib_info->back) != last_blkno ||
				sib_info->magic != dead_info->magic)) {
			xfs_error(mp, "user readable error message");
			return -EFSCORRUPTED;
		}

That solves the patch/quote indent problem, documents the code well,
and only sacrifices a single tab for the condition statements...

/me gets back on his bike and leaves the shed coated in wet paint.

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com

  reply index

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-08  7:05 [PATCH v3 0/2] xfs: refactor corruption checking and reporting Darrick J. Wong
2019-11-08  7:05 ` [PATCH 1/2] xfs: refactor "does this fork map blocks" predicate Darrick J. Wong
2019-11-08  7:15   ` Christoph Hellwig
2019-11-08  7:05 ` [PATCH 2/2] xfs: convert open coded corruption check to use XFS_IS_CORRUPT Darrick J. Wong
2019-11-08  7:21   ` Christoph Hellwig
2019-11-09 22:32   ` Dave Chinner
2019-11-10  0:18     ` Darrick J. Wong
2019-11-10  2:49       ` Dave Chinner [this message]
2019-11-10 18:20         ` Darrick J. Wong

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191110024919.GJ4614@dread.disaster.area \
    --to=david@fromorbit.com \
    --cc=darrick.wong@oracle.com \
    --cc=hch@infradead.org \
    --cc=linux-xfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-XFS Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-xfs/0 linux-xfs/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-xfs linux-xfs/ https://lore.kernel.org/linux-xfs \
		linux-xfs@vger.kernel.org
	public-inbox-index linux-xfs

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-xfs


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git