lkml.org 
[lkml]   [2013]   [Nov]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 34/39] staging/lustre/llite: cancel open lock before closing file
    Date
    From: Jinshan Xiong <jinshan.xiong@intel.com>

    In error handling path of ll_lease_open(), och has already been
    freed in ll_close_inode_openhandle() so the sequence of cancel
    open lock and close open handle need adjusting.

    Lustre-change: http://review.whamcloud.com/7346
    Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3647
    Signed-off-by: Jinshan Xiong <jinshan.xiong@intel.com>
    Reviewed-by: John L. Hammond <john.hammond@intel.com>
    Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
    Signed-off-by: Peng Tao <bergwolf@gmail.com>
    Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
    ---
    drivers/staging/lustre/lustre/llite/file.c | 18 +++++++++++-------
    1 file changed, 11 insertions(+), 7 deletions(-)

    diff --git a/drivers/staging/lustre/lustre/llite/file.c b/drivers/staging/lustre/lustre/llite/file.c
    index 390bea5..a2a9844 100644
    --- a/drivers/staging/lustre/lustre/llite/file.c
    +++ b/drivers/staging/lustre/lustre/llite/file.c
    @@ -847,20 +847,24 @@ struct obd_client_handle *ll_lease_open(struct inode *inode, struct file *file,
    return och;

    out_close:
    - rc2 = ll_close_inode_openhandle(sbi->ll_md_exp, inode, och, NULL);
    - if (rc2)
    - CERROR("Close openhandle returned %d\n", rc2);
    -
    - /* cancel open lock */
    + /* Cancel open lock */
    if (it.d.lustre.it_lock_mode != 0) {
    ldlm_lock_decref_and_cancel(&och->och_lease_handle,
    - it.d.lustre.it_lock_mode);
    + it.d.lustre.it_lock_mode);
    it.d.lustre.it_lock_mode = 0;
    + och->och_lease_handle.cookie = 0ULL;
    }
    + rc2 = ll_close_inode_openhandle(sbi->ll_md_exp, inode, och, NULL);
    + if (rc2 < 0)
    + CERROR("%s: error closing file "DFID": %d\n",
    + ll_get_fsname(inode->i_sb, NULL, 0),
    + PFID(&ll_i2info(inode)->lli_fid), rc2);
    + och = NULL; /* och has been freed in ll_close_inode_openhandle() */
    out_release_it:
    ll_intent_release(&it);
    out:
    - OBD_FREE_PTR(och);
    + if (och != NULL)
    + OBD_FREE_PTR(och);
    return ERR_PTR(rc);
    }
    EXPORT_SYMBOL(ll_lease_open);
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2013-11-14 20:41    [W:4.243 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site