From df685d2f5e0b6f408fd8c4ca2c20143958dac663 Mon Sep 17 00:00:00 2001 From: Jinshan Xiong Date: Thu, 15 Aug 2013 15:11:26 -0700 Subject: [PATCH] LU-3647 llite: cancel open lock before closing file 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. Signed-off-by: Jinshan Xiong Change-Id: I02ac654e7ac0dd482a80ede727ea1e90382a5f76 Reviewed-on: http://review.whamcloud.com/7346 Tested-by: Hudson Tested-by: Maloo Reviewed-by: John L. Hammond Reviewed-by: Oleg Drokin --- lustre/llite/file.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/lustre/llite/file.c b/lustre/llite/file.c index 0179dd0..000b82a 100644 --- a/lustre/llite/file.c +++ b/lustre/llite/file.c @@ -864,20 +864,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.8.3.1