lkml.org 
[lkml]   [2008]   [Sep]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] UBIFS: remove unneeded unlikely()
    Date
    From: Hirofumi Nakagawa <hnakagawa@miraclelinux.com>

    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>
    ---
    fs/ubifs/find.c | 4 ++--
    fs/ubifs/gc.c | 8 ++++----
    fs/ubifs/tnc.c | 4 ++--
    fs/ubifs/xattr.c | 2 +-
    4 files changed, 9 insertions(+), 9 deletions(-)

    diff --git a/fs/ubifs/find.c b/fs/ubifs/find.c
    index 47814cd..717d79c 100644
    --- a/fs/ubifs/find.c
    +++ b/fs/ubifs/find.c
    @@ -901,11 +901,11 @@ static int get_idx_gc_leb(struct ubifs_info *c)
    * it is needed now for this commit.
    */
    lp = ubifs_lpt_lookup_dirty(c, lnum);
    - if (unlikely(IS_ERR(lp)))
    + if (IS_ERR(lp))
    return PTR_ERR(lp);
    lp = ubifs_change_lp(c, lp, LPROPS_NC, LPROPS_NC,
    lp->flags | LPROPS_INDEX, -1);
    - if (unlikely(IS_ERR(lp)))
    + if (IS_ERR(lp))
    return PTR_ERR(lp);
    dbg_find("LEB %d, dirty %d and free %d flags %#x",
    lp->lnum, lp->dirty, lp->free, lp->flags);
    diff --git a/fs/ubifs/gc.c b/fs/ubifs/gc.c
    index 02aba36..a6b633a 100644
    --- a/fs/ubifs/gc.c
    +++ b/fs/ubifs/gc.c
    @@ -653,7 +653,7 @@ int ubifs_gc_start_commit(struct ubifs_info *c)
    */
    while (1) {
    lp = ubifs_fast_find_freeable(c);
    - if (unlikely(IS_ERR(lp))) {
    + if (IS_ERR(lp)) {
    err = PTR_ERR(lp);
    goto out;
    }
    @@ -665,7 +665,7 @@ int ubifs_gc_start_commit(struct ubifs_info *c)
    if (err)
    goto out;
    lp = ubifs_change_lp(c, lp, c->leb_size, 0, lp->flags, 0);
    - if (unlikely(IS_ERR(lp))) {
    + if (IS_ERR(lp)) {
    err = PTR_ERR(lp);
    goto out;
    }
    @@ -680,7 +680,7 @@ int ubifs_gc_start_commit(struct ubifs_info *c)
    /* Record index freeable LEBs for unmapping after commit */
    while (1) {
    lp = ubifs_fast_find_frdi_idx(c);
    - if (unlikely(IS_ERR(lp))) {
    + if (IS_ERR(lp)) {
    err = PTR_ERR(lp);
    goto out;
    }
    @@ -696,7 +696,7 @@ int ubifs_gc_start_commit(struct ubifs_info *c)
    /* Don't release the LEB until after the next commit */
    flags = (lp->flags | LPROPS_TAKEN) ^ LPROPS_INDEX;
    lp = ubifs_change_lp(c, lp, c->leb_size, 0, flags, 1);
    - if (unlikely(IS_ERR(lp))) {
    + if (IS_ERR(lp)) {
    err = PTR_ERR(lp);
    kfree(idx_gc);
    goto out;
    diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c
    index 7634c59..ba13c92 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);
    diff --git a/fs/ubifs/xattr.c b/fs/ubifs/xattr.c
    index 649bec7..cfd31e2 100644
    --- a/fs/ubifs/xattr.c
    +++ b/fs/ubifs/xattr.c
    @@ -446,7 +446,7 @@ ssize_t ubifs_listxattr(struct dentry *dentry, char *buffer, size_t size)
    int type;

    xent = ubifs_tnc_next_ent(c, &key, &nm);
    - if (unlikely(IS_ERR(xent))) {
    + if (IS_ERR(xent)) {
    err = PTR_ERR(xent);
    break;
    }
    --
    1.5.4.1


    \
     
     \ /
      Last update: 2008-09-30 09:51    [W:0.028 / U:59.516 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site