linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Sterba <dsterba@suse.cz>
To: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Randy Dunlap <rdunlap@infradead.org>,
	Stephen Rothwell <sfr@canb.auug.org.au>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Btrfs <linux-btrfs@vger.kernel.org>,
	Peter Zijlstra <peterz@infradead.org>
Subject: Re: linux-next: Tree for Dec 6 (objtool, lots in btrfs)
Date: Tue, 17 Dec 2019 16:29:54 +0100	[thread overview]
Message-ID: <20191217152954.GH3929@suse.cz> (raw)
In-Reply-To: <20191214054515.ougsr5ykhl3vvy57@treble>

On Fri, Dec 13, 2019 at 11:45:15PM -0600, Josh Poimboeuf wrote:
> On Fri, Dec 13, 2019 at 04:04:58PM -0800, Randy Dunlap wrote:
> > > diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
> > > index b2e8fd8a8e59..bbd68520f5f1 100644
> > > --- a/fs/btrfs/ctree.h
> > > +++ b/fs/btrfs/ctree.h
> > > @@ -3110,14 +3110,16 @@ do {								\
> > >  	rcu_read_unlock();					\
> > >  } while (0)
> > >  
> > > -__cold
> > > +#ifdef CONFIG_BTRFS_ASSERT
> > > +__cold __unlikely
> > 
> > what provides __unlikely?  It is causing build errors.
> > 
> > and if I remove the "__unlikely", I still see the objtool warnings
> > (unreachable instructions).
> 
> Ha, not sure how that happened... Should be __noreturn instead of
> __unlikely.  Cheers...
> 
> diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
> index b2e8fd8a8e59..398bd010dfc5 100644
> --- a/fs/btrfs/ctree.h
> +++ b/fs/btrfs/ctree.h
> @@ -3110,14 +3110,16 @@ do {								\
>  	rcu_read_unlock();					\
>  } while (0)
>  
> -__cold
> +#ifdef CONFIG_BTRFS_ASSERT
> +__cold __noreturn
>  static inline void assfail(const char *expr, const char *file, int line)
>  {
> -	if (IS_ENABLED(CONFIG_BTRFS_ASSERT)) {
> -		pr_err("assertion failed: %s, in %s:%d\n", expr, file, line);
> -		BUG();
> -	}
> +	pr_err("assertion failed: %s, in %s:%d\n", expr, file, line);
> +	BUG();
>  }
> +#else
> +static inline void assfail(const char *expr, const char *file, int line) {}
> +#endif
>  
>  #define ASSERT(expr)	\
>  	(likely(expr) ? (void)0 : assfail(#expr, __FILE__, __LINE__))

Separating the definitions by #ifdef looks ok, I'd rather do separate
definitions of ASSERT too, to avoid the ternary operator. I'll send the
patch.

  parent reply	other threads:[~2019-12-17 15:30 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20191206135406.563336e7@canb.auug.org.au>
2019-12-06 16:17 ` linux-next: Tree for Dec 6 (objtool, lots in btrfs) Randy Dunlap
2019-12-11 13:49   ` David Sterba
2019-12-11 16:21     ` Randy Dunlap
2019-12-12 18:47       ` Josh Poimboeuf
2019-12-12 20:25         ` Randy Dunlap
     [not found]           ` <ba2a7a9b-933b-d4e4-8970-85b6c1291fca@infradead.org>
2019-12-13 23:50             ` Josh Poimboeuf
2019-12-14  0:04               ` Randy Dunlap
2019-12-14  5:45                 ` Josh Poimboeuf
     [not found]                   ` <fe1e0318-9b74-7ae0-07bd-d7a6c908e79a@infradead.org>
2019-12-17 15:25                     ` David Sterba
2020-01-17 17:26                       ` Josh Poimboeuf
2020-01-17 20:28                         ` Marco Elver
2020-01-17 21:26                           ` Josh Poimboeuf
2020-01-17 22:22                             ` Josh Poimboeuf
2019-12-17 15:29                   ` David Sterba [this message]
2020-01-10 19:46                     ` David Sterba
2020-01-17 15:28                       ` Josh Poimboeuf
2020-01-17 16:50                         ` David Sterba
2020-01-17 17:03                           ` Josh Poimboeuf

Reply instructions:

You may reply publicly 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=20191217152954.GH3929@suse.cz \
    --to=dsterba@suse.cz \
    --cc=jpoimboe@redhat.com \
    --cc=linux-btrfs@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=peterz@infradead.org \
    --cc=rdunlap@infradead.org \
    --cc=sfr@canb.auug.org.au \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).