Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e55a68b6 authored by Jinshan Xiong's avatar Jinshan Xiong Committed by Greg Kroah-Hartman
Browse files

staging: lustre: 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: default avatarJinshan Xiong <jinshan.xiong@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3647
Reviewed-on: http://review.whamcloud.com/7346


Reviewed-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0fcd869f

drivers/staging/lustre/lustre/llite/file.c

+8 −5
Original line number Diff line number Diff line
@@ -875,16 +875,19 @@ ll_lease_open(struct inode *inode, struct file *file, fmode_t fmode, 
	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 = 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: