projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
ntfs: remove (un)?likely() from IS_ERR() conditions
[linux-2.6-microblaze.git]
/
fs
/
ntfs
/
runlist.c
diff --git
a/fs/ntfs/runlist.c
b/fs/ntfs/runlist.c
index
508744a
..
97932fb
100644
(file)
--- 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.");