aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ntfs/super.c
diff options
context:
space:
mode:
authorDenis Efremov <efremov@linux.com>2019-09-25 16:49:43 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-09-26 10:10:44 -0700
commitcc22c800e15b03c87f0e97400f75eba998e75c6a (patch)
tree437eeb0056fa689d9ea01d82f1ae7254e1e85264 /fs/ntfs/super.c
parentIB/hfi1: remove unlikely() from IS_ERR*() condition (diff)
downloadlinux-dev-cc22c800e15b03c87f0e97400f75eba998e75c6a.tar.xz
linux-dev-cc22c800e15b03c87f0e97400f75eba998e75c6a.zip
ntfs: remove (un)?likely() from IS_ERR() conditions
"likely(!IS_ERR(x))" is excessive. IS_ERR() already uses unlikely() internally. Link: http://lkml.kernel.org/r/20190829165025.15750-11-efremov@linux.com Signed-off-by: Denis Efremov <efremov@linux.com> Cc: Anton Altaparmakov <anton@tuxera.com> Cc: Joe Perches <joe@perches.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '')
-rw-r--r--fs/ntfs/super.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
index 29621d40f448..7dc3bc604f78 100644
--- a/fs/ntfs/super.c
+++ b/fs/ntfs/super.c
@@ -1475,7 +1475,7 @@ not_enabled:
kfree(name);
/* Get the inode. */
tmp_ino = ntfs_iget(vol->sb, MREF(mref));
- if (unlikely(IS_ERR(tmp_ino) || is_bad_inode(tmp_ino))) {
+ if (IS_ERR(tmp_ino) || unlikely(is_bad_inode(tmp_ino))) {
if (!IS_ERR(tmp_ino))
iput(tmp_ino);
ntfs_error(vol->sb, "Failed to load $UsnJrnl.");