All of lore.kernel.org
 help / color / mirror / Atom feed
From: Denis Efremov <efremov@linux.com>
To: linux-kernel@vger.kernel.org
Cc: Denis Efremov <efremov@linux.com>,
	"Darrick J. Wong" <darrick.wong@oracle.com>,
	Joe Perches <joe@perches.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	linux-xfs@vger.kernel.org
Subject: [PATCH v3 07/11] xfs: remove unlikely() from WARN_ON() condition
Date: Thu, 29 Aug 2019 19:50:21 +0300	[thread overview]
Message-ID: <20190829165025.15750-7-efremov@linux.com> (raw)
In-Reply-To: <20190829165025.15750-1-efremov@linux.com>

"unlikely(WARN_ON(x))" is excessive. WARN_ON() already uses unlikely()
internally.

Signed-off-by: Denis Efremov <efremov@linux.com>
Cc: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: Joe Perches <joe@perches.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-xfs@vger.kernel.org
---
 fs/xfs/xfs_buf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index ca0849043f54..4389d87ff0f0 100644
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -2096,7 +2096,7 @@ xfs_verify_magic(
 	int			idx;
 
 	idx = xfs_sb_version_hascrc(&mp->m_sb);
-	if (unlikely(WARN_ON(!bp->b_ops || !bp->b_ops->magic[idx])))
+	if (WARN_ON(!bp->b_ops || !bp->b_ops->magic[idx]))
 		return false;
 	return dmagic == bp->b_ops->magic[idx];
 }
@@ -2114,7 +2114,7 @@ xfs_verify_magic16(
 	int			idx;
 
 	idx = xfs_sb_version_hascrc(&mp->m_sb);
-	if (unlikely(WARN_ON(!bp->b_ops || !bp->b_ops->magic16[idx])))
+	if (WARN_ON(!bp->b_ops || !bp->b_ops->magic16[idx]))
 		return false;
 	return dmagic == bp->b_ops->magic16[idx];
 }
-- 
2.21.0


  parent reply	other threads:[~2019-08-29 16:51 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-29 16:50 [PATCH v3 01/11] checkpatch: check for nested (un)?likely() calls Denis Efremov
2019-08-29 16:50 ` [Xen-devel] " Denis Efremov
2019-08-29 16:50 ` Denis Efremov
2019-08-29 16:50 ` [PATCH v3 02/11] drm/msm: remove unlikely() from WARN_ON() conditions Denis Efremov
2019-09-04  4:13   ` Bjorn Andersson
2019-08-29 16:50 ` [PATCH v3 03/11] net/mlx5e: Remove unlikely() from WARN*() condition Denis Efremov
2019-08-29 21:23   ` Saeed Mahameed
2019-08-31  2:50     ` David Miller
2019-08-29 16:50 ` [PATCH v3 04/11] xen/events: Remove unlikely() from WARN() condition Denis Efremov
2019-08-29 16:50   ` [Xen-devel] " Denis Efremov
2019-08-29 16:50 ` [PATCH v3 05/11] fs: remove unlikely() from WARN_ON() condition Denis Efremov
2019-08-29 16:50 ` [PATCH v3 06/11] wimax/i2400m: remove unlikely() from WARN*() condition Denis Efremov
2019-08-31 11:25   ` Markus Elfring
2019-08-31 15:59     ` Denis Efremov
2019-08-29 16:50 ` Denis Efremov [this message]
2019-08-29 21:22   ` [PATCH v3 07/11] xfs: remove unlikely() from WARN_ON() condition Darrick J. Wong
2019-08-30  5:37   ` Christoph Hellwig
2019-08-29 16:50 ` [PATCH v3 08/11] IB/hfi1: Remove unlikely() from IS_ERR*() condition Denis Efremov
2019-08-29 16:50 ` [PATCH v3 09/11] Input: alps - remove " Denis Efremov
2019-08-29 17:50   ` Dmitry Torokhov
2019-08-31 15:25     ` Pali Rohár
2019-08-31 15:50       ` Denis Efremov
2019-08-31 20:32       ` Joe Perches
2019-08-31 21:03         ` Dmitry Torokhov
2019-08-29 16:50 ` [PATCH v3 10/11] udp: Remove " Denis Efremov
2019-08-29 16:50 ` [PATCH v3 11/11] ntfs: remove (un)?likely() from IS_ERR() conditions Denis Efremov
2019-08-31  9:15 ` [PATCH v3 01/11] checkpatch: check for nested (un)?likely() calls Markus Elfring
2019-08-31  9:15   ` [Xen-devel] " Markus Elfring
2019-08-31  9:15   ` Markus Elfring
2019-08-31 15:54   ` Denis Efremov
2019-08-31 15:54     ` [Xen-devel] " Denis Efremov
2019-08-31 15:54     ` Denis Efremov
2019-08-31 16:45     ` Markus Elfring
2019-08-31 16:45       ` [Xen-devel] " Markus Elfring
2019-08-31 16:45       ` Markus Elfring
2019-08-31 17:07       ` Denis Efremov
2019-08-31 17:07         ` [Xen-devel] " Denis Efremov
2019-08-31 17:07         ` Denis Efremov
2019-08-31 17:26         ` Markus Elfring
2019-08-31 17:26           ` [Xen-devel] " Markus Elfring
2019-08-31 17:26           ` Markus Elfring

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=20190829165025.15750-7-efremov@linux.com \
    --to=efremov@linux.com \
    --cc=akpm@linux-foundation.org \
    --cc=darrick.wong@oracle.com \
    --cc=joe@perches.com \
    --cc=linux-kernel@vger.kernel.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
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.