The patch titled
Subject: xfs: remove unlikely() from WARN_ON() condition
has been added to the -mm tree. Its filename is
xfs-remove-unlikely-from-warn_on-condition.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/xfs-remove-unlikely-from-warn_on-condition.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/xfs-remove-unlikely-from-warn_on-condition.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Denis Efremov <efremov@xxxxxxxxx>
Subject: xfs: remove unlikely() from WARN_ON() condition
"unlikely(WARN_ON(x))" is excessive. WARN_ON() already uses unlikely()
internally.
Link: http://lkml.kernel.org/r/20190829165025.15750-7-efremov@xxxxxxxxx
Signed-off-by: Denis Efremov <efremov@xxxxxxxxx>
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
Cc: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/xfs/xfs_buf.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/fs/xfs/xfs_buf.c~xfs-remove-unlikely-from-warn_on-condition
+++ a/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];
}
_
Patches currently in -mm which might be from efremov@xxxxxxxxx are
checkpatch-check-for-nested-unlikely-calls.patch
drm-msm-remove-unlikely-from-warn_on-conditions.patch
net-mlx5e-remove-unlikely-from-warn-condition.patch
xen-events-remove-unlikely-from-warn-condition.patch
fs-remove-unlikely-from-warn_on-condition.patch
wimax-i2400m-remove-unlikely-from-warn-condition.patch
xfs-remove-unlikely-from-warn_on-condition.patch
ib-hfi1-remove-unlikely-from-is_err-condition.patch
udp-remove-unlikely-from-is_err-condition.patch
ntfs-remove-unlikely-from-is_err-conditions.patch
