lkml.org 
[lkml]   [2014]   [Dec]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 1/1] lustre: Deletion of unnecessary checks before three function calls
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Tue, 2 Dec 2014 11:40:33 +0100

    The functions free_ll_remote_perm(), free_rmtperm_hash() and iput() test
    whether their argument is NULL and then return immediately.
    Thus the test around their calls is not needed.

    This issue was detected by using the Coccinelle software.

    Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
    ---
    drivers/staging/lustre/lustre/llite/remote_perm.c | 5 ++---
    drivers/staging/lustre/lustre/llite/statahead.c | 3 +--
    2 files changed, 3 insertions(+), 5 deletions(-)

    diff --git a/drivers/staging/lustre/lustre/llite/remote_perm.c b/drivers/staging/lustre/lustre/llite/remote_perm.c
    index c05a912..a581826 100644
    --- a/drivers/staging/lustre/lustre/llite/remote_perm.c
    +++ b/drivers/staging/lustre/lustre/llite/remote_perm.c
    @@ -194,7 +194,7 @@ int ll_update_remote_perm(struct inode *inode, struct mdt_remote_perm *perm)

    if (!lli->lli_remote_perms)
    lli->lli_remote_perms = perm_hash;
    - else if (perm_hash)
    + else
    free_rmtperm_hash(perm_hash);

    head = lli->lli_remote_perms + remote_perm_hashfunc(perm->rp_uid);
    @@ -209,8 +209,7 @@ again:
    continue;
    if (tmp->lrp_fsgid != perm->rp_fsgid)
    continue;
    - if (lrp)
    - free_ll_remote_perm(lrp);
    + free_ll_remote_perm(lrp);
    lrp = tmp;
    break;
    }
    diff --git a/drivers/staging/lustre/lustre/llite/statahead.c b/drivers/staging/lustre/lustre/llite/statahead.c
    index 227854b..6ad9dd0 100644
    --- a/drivers/staging/lustre/lustre/llite/statahead.c
    +++ b/drivers/staging/lustre/lustre/llite/statahead.c
    @@ -334,8 +334,7 @@ static void ll_sa_entry_put(struct ll_statahead_info *sai,
    LASSERT(ll_sa_entry_unhashed(entry));

    ll_sa_entry_cleanup(sai, entry);
    - if (entry->se_inode)
    - iput(entry->se_inode);
    + iput(entry->se_inode);

    OBD_FREE(entry, entry->se_size);
    atomic_dec(&sai->sai_cache_count);
    --
    2.1.3


    \
     
     \ /
      Last update: 2014-12-02 12:21    [W:4.020 / U:1.700 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site