diff options
| author | Hirofumi Nakagawa <hnakagawa@miraclelinux.com> | 2008-08-21 18:16:40 +0400 |
|---|---|---|
| committer | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2008-09-30 12:12:55 +0400 |
| commit | 8d47aef43ba166bdd11d522307c61ab23aab61c3 (patch) | |
| tree | 7d462c2d304610b4eba3ceab1e39995efdc62bf9 /fs/ubifs/tnc.c | |
| parent | 948cfb219bbbc3c8e1b10a671ca88219fa42a052 (diff) | |
| download | linux-8d47aef43ba166bdd11d522307c61ab23aab61c3.tar.xz | |
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, } zn = copy_znode(c, znode); - if (unlikely(IS_ERR(zn))) + if (IS_ERR(zn)) return zn; if (zbr->len) { @@ -1128,7 +1128,7 @@ static struct ubifs_znode *dirty_cow_bottom_up(struct ubifs_info *c, ubifs_assert(znode == c->zroot.znode); znode = dirty_cow_znode(c, &c->zroot); } - if (unlikely(IS_ERR(znode)) || !p) + if (IS_ERR(znode) || !p) break; ubifs_assert(path[p - 1] >= 0); ubifs_assert(path[p - 1] < znode->child_cnt); |