diff options
author | Hirofumi Nakagawa <hnakagawa@miraclelinux.com> | 2008-08-21 10:16:40 -0400 |
---|---|---|
committer | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2008-09-30 04:12:55 -0400 |
commit | 8d47aef43ba166bdd11d522307c61ab23aab61c3 (patch) | |
tree | 7d462c2d304610b4eba3ceab1e39995efdc62bf9 /fs/ubifs/tnc.c | |
parent | 948cfb219bbbc3c8e1b10a671ca88219fa42a052 (diff) |
UBIFS: remove unneeded unlikely()
IS_ERR() macro already has unlikely(), so do not use constructions
like 'if (unlikely(IS_ERR())'.
Signed-off-by: Hirofumi Nakagawa <hnakagawa@miraclelinux.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'fs/ubifs/tnc.c')
-rw-r--r-- | fs/ubifs/tnc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c index 7634c5970887..ba13c92fdf6a 100644 --- a/fs/ubifs/tnc.c +++ b/fs/ubifs/tnc.c | |||
@@ -284,7 +284,7 @@ static struct ubifs_znode *dirty_cow_znode(struct ubifs_info *c, | |||
284 | } | 284 | } |
285 | 285 | ||
286 | zn = copy_znode(c, znode); | 286 | zn = copy_znode(c, znode); |
287 | if (unlikely(IS_ERR(zn))) | 287 | if (IS_ERR(zn)) |
288 | return zn; | 288 | return zn; |
289 | 289 | ||
290 | if (zbr->len) { | 290 | if (zbr->len) { |
@@ -1128,7 +1128,7 @@ static struct ubifs_znode *dirty_cow_bottom_up(struct ubifs_info *c, | |||
1128 | ubifs_assert(znode == c->zroot.znode); | 1128 | ubifs_assert(znode == c->zroot.znode); |
1129 | znode = dirty_cow_znode(c, &c->zroot); | 1129 | znode = dirty_cow_znode(c, &c->zroot); |
1130 | } | 1130 | } |
1131 | if (unlikely(IS_ERR(znode)) || !p) | 1131 | if (IS_ERR(znode) || !p) |
1132 | break; | 1132 | break; |
1133 | ubifs_assert(path[p - 1] >= 0); | 1133 | ubifs_assert(path[p - 1] >= 0); |
1134 | ubifs_assert(path[p - 1] < znode->child_cnt); | 1134 | ubifs_assert(path[p - 1] < znode->child_cnt); |