lkml.org 
[lkml]   [2015]   [Jun]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] staging: lustre: Deletion of unnecessary checks before three function calls
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Fri, 26 Jun 2015 23:10:42 +0200

    The following functions test whether their argument is NULL and then
    return immediately.
    * kfree
    * ll_file_data_put
    * ptlrpc_connection_put

    Thus the test around such calls is not needed.

    This issue was detected by using the Coccinelle software.


    See also a previous update suggestion:
    "remove unneeded null test before free" by Julia Lawall
    https://lkml.org/lkml/2015/5/1/498
    https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg878600.html

    Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
    ---
    drivers/staging/lustre/lustre/llite/file.c | 3 +--
    drivers/staging/lustre/lustre/llite/llite_lib.c | 2 +-
    drivers/staging/lustre/lustre/ptlrpc/import.c | 6 ++----
    drivers/staging/lustre/lustre/ptlrpc/service.c | 4 +---
    4 files changed, 5 insertions(+), 10 deletions(-)

    diff --git a/drivers/staging/lustre/lustre/llite/file.c b/drivers/staging/lustre/lustre/llite/file.c
    index 3075db2..1a85c41 100644
    --- a/drivers/staging/lustre/lustre/llite/file.c
    +++ b/drivers/staging/lustre/lustre/llite/file.c
    @@ -702,8 +702,7 @@ out_och_free:
    out_openerr:
    if (opendir_set != 0)
    ll_stop_statahead(inode, lli->lli_opendir_key);
    - if (fd != NULL)
    - ll_file_data_put(fd);
    + ll_file_data_put(fd);
    } else {
    ll_stats_ops_tally(ll_i2sbi(inode), LPROC_LL_OPEN, 1);
    }
    diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c b/drivers/staging/lustre/lustre/llite/llite_lib.c
    index 2513988..ab4839c 100644
    --- a/drivers/staging/lustre/lustre/llite/llite_lib.c
    +++ b/drivers/staging/lustre/lustre/llite/llite_lib.c
    @@ -1114,7 +1114,7 @@ void ll_clear_inode(struct inode *inode)
    if (lli->lli_mds_read_och)
    ll_md_real_close(inode, FMODE_READ);

    - if (S_ISLNK(inode->i_mode) && lli->lli_symlink_name) {
    + if (S_ISLNK(inode->i_mode)) {
    kfree(lli->lli_symlink_name);
    lli->lli_symlink_name = NULL;
    }
    diff --git a/drivers/staging/lustre/lustre/ptlrpc/import.c b/drivers/staging/lustre/lustre/ptlrpc/import.c
    index c9b8481..1eae389 100644
    --- a/drivers/staging/lustre/lustre/ptlrpc/import.c
    +++ b/drivers/staging/lustre/lustre/ptlrpc/import.c
    @@ -555,14 +555,12 @@ static int import_select_connection(struct obd_import *imp)
    imp_conn->oic_last_attempt = cfs_time_current_64();

    /* switch connection, don't mind if it's same as the current one */
    - if (imp->imp_connection)
    - ptlrpc_connection_put(imp->imp_connection);
    + ptlrpc_connection_put(imp->imp_connection);
    imp->imp_connection = ptlrpc_connection_addref(imp_conn->oic_conn);

    dlmexp = class_conn2export(&imp->imp_dlm_handle);
    LASSERT(dlmexp != NULL);
    - if (dlmexp->exp_connection)
    - ptlrpc_connection_put(dlmexp->exp_connection);
    + ptlrpc_connection_put(dlmexp->exp_connection);
    dlmexp->exp_connection = ptlrpc_connection_addref(imp_conn->oic_conn);
    class_export_put(dlmexp);

    diff --git a/drivers/staging/lustre/lustre/ptlrpc/service.c b/drivers/staging/lustre/lustre/ptlrpc/service.c
    index 9117f1c..b9ae0b7 100644
    --- a/drivers/staging/lustre/lustre/ptlrpc/service.c
    +++ b/drivers/staging/lustre/lustre/ptlrpc/service.c
    @@ -2826,9 +2826,7 @@ void ptlrpc_hr_fini(void)
    ptlrpc_stop_hr_threads();

    cfs_percpt_for_each(hrp, i, ptlrpc_hr.hr_partitions) {
    - if (hrp->hrp_thrs != NULL) {
    - kfree(hrp->hrp_thrs);
    - }
    + kfree(hrp->hrp_thrs);
    }

    cfs_percpt_free(ptlrpc_hr.hr_partitions);
    --
    2.4.4


    \
     
     \ /
      Last update: 2015-06-26 23:41    [W:4.412 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site