lkml.org 
[lkml]   [2008]   [Apr]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 57/62] fs/ocfs2/aops.c: test for IS_ERR rather than 0
    Date
    From: Julia Lawall <julia@diku.dk>

    The function ocfs2_start_trans always returns either a valid pointer or a
    value made with ERR_PTR, so its result should be tested with IS_ERR, not
    with a test for 0.

    Signed-off-by: Julia Lawall <julia@diku.dk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Mark Fasheh <mfasheh@suse.com>
    ---
    fs/ocfs2/aops.c | 6 +++---
    1 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
    index 90383ed..17964c0 100644
    --- a/fs/ocfs2/aops.c
    +++ b/fs/ocfs2/aops.c
    @@ -467,11 +467,11 @@ handle_t *ocfs2_start_walk_page_trans(struct inode *inode,
    unsigned to)
    {
    struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
    - handle_t *handle = NULL;
    + handle_t *handle;
    int ret = 0;

    handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
    - if (!handle) {
    + if (IS_ERR(handle)) {
    ret = -ENOMEM;
    mlog_errno(ret);
    goto out;
    @@ -487,7 +487,7 @@ handle_t *ocfs2_start_walk_page_trans(struct inode *inode,
    }
    out:
    if (ret) {
    - if (handle)
    + if (!IS_ERR(handle))
    ocfs2_commit_trans(osb, handle);
    handle = ERR_PTR(ret);
    }
    --
    1.5.4.1


    \
     
     \ /
      Last update: 2008-04-02 22:43    [W:9.338 / U:0.424 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site