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/gc.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/gc.c')
-rw-r--r-- | fs/ubifs/gc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ubifs/gc.c b/fs/ubifs/gc.c index 02aba36fe3d4..a6b633a5629f 100644 --- a/fs/ubifs/gc.c +++ b/fs/ubifs/gc.c | |||
@@ -653,7 +653,7 @@ int ubifs_gc_start_commit(struct ubifs_info *c) | |||
653 | */ | 653 | */ |
654 | while (1) { | 654 | while (1) { |
655 | lp = ubifs_fast_find_freeable(c); | 655 | lp = ubifs_fast_find_freeable(c); |
656 | if (unlikely(IS_ERR(lp))) { | 656 | if (IS_ERR(lp)) { |
657 | err = PTR_ERR(lp); | 657 | err = PTR_ERR(lp); |
658 | goto out; | 658 | goto out; |
659 | } | 659 | } |
@@ -665,7 +665,7 @@ int ubifs_gc_start_commit(struct ubifs_info *c) | |||
665 | if (err) | 665 | if (err) |
666 | goto out; | 666 | goto out; |
667 | lp = ubifs_change_lp(c, lp, c->leb_size, 0, lp->flags, 0); | 667 | lp = ubifs_change_lp(c, lp, c->leb_size, 0, lp->flags, 0); |
668 | if (unlikely(IS_ERR(lp))) { | 668 | if (IS_ERR(lp)) { |
669 | err = PTR_ERR(lp); | 669 | err = PTR_ERR(lp); |
670 | goto out; | 670 | goto out; |
671 | } | 671 | } |
@@ -680,7 +680,7 @@ int ubifs_gc_start_commit(struct ubifs_info *c) | |||
680 | /* Record index freeable LEBs for unmapping after commit */ | 680 | /* Record index freeable LEBs for unmapping after commit */ |
681 | while (1) { | 681 | while (1) { |
682 | lp = ubifs_fast_find_frdi_idx(c); | 682 | lp = ubifs_fast_find_frdi_idx(c); |
683 | if (unlikely(IS_ERR(lp))) { | 683 | if (IS_ERR(lp)) { |
684 | err = PTR_ERR(lp); | 684 | err = PTR_ERR(lp); |
685 | goto out; | 685 | goto out; |
686 | } | 686 | } |
@@ -696,7 +696,7 @@ int ubifs_gc_start_commit(struct ubifs_info *c) | |||
696 | /* Don't release the LEB until after the next commit */ | 696 | /* Don't release the LEB until after the next commit */ |
697 | flags = (lp->flags | LPROPS_TAKEN) ^ LPROPS_INDEX; | 697 | flags = (lp->flags | LPROPS_TAKEN) ^ LPROPS_INDEX; |
698 | lp = ubifs_change_lp(c, lp, c->leb_size, 0, flags, 1); | 698 | lp = ubifs_change_lp(c, lp, c->leb_size, 0, flags, 1); |
699 | if (unlikely(IS_ERR(lp))) { | 699 | if (IS_ERR(lp)) { |
700 | err = PTR_ERR(lp); | 700 | err = PTR_ERR(lp); |
701 | kfree(idx_gc); | 701 | kfree(idx_gc); |
702 | goto out; | 702 | goto out; |