summaryrefslogtreecommitdiff
path: root/fs/ntfs/runlist.c
diff options
context:
space:
mode:
authorDenis Efremov <efremov@linux.com>2019-09-26 02:49:43 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2019-09-26 20:10:44 +0300
commitcc22c800e15b03c87f0e97400f75eba998e75c6a (patch)
tree437eeb0056fa689d9ea01d82f1ae7254e1e85264 /fs/ntfs/runlist.c
parent7b0b69259433fc1758408a899224db4fcc41b865 (diff)
downloadlinux-cc22c800e15b03c87f0e97400f75eba998e75c6a.tar.xz
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 'fs/ntfs/runlist.c')
-rw-r--r--fs/ntfs/runlist.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ntfs/runlist.c b/fs/ntfs/runlist.c
index 508744a93180..97932fb5179c 100644
--- a/fs/ntfs/runlist.c
+++ b/fs/ntfs/runlist.c
@@ -951,7 +951,7 @@ mpa_err:
}
/* Now combine the new and old runlists checking for overlaps. */
old_rl = ntfs_runlists_merge(old_rl, rl);
- if (likely(!IS_ERR(old_rl)))
+ if (!IS_ERR(old_rl))
return old_rl;
ntfs_free(rl);
ntfs_error(vol->sb, "Failed to merge runlists.");