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

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

staging: lustre: hsm: Fix lu_ref for lease handle 



The lu_ref was not being decremented when releasing the
lease handle.

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/7243


Reviewed-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Reviewed-by: default avatarjacques-Charles Lafoucriere <jacques-charles.lafoucriere@cea.fr>
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 83c61a5c

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

+2 −2
Original line number Diff line number Diff line
@@ -908,7 +908,7 @@ static int ll_lease_close(struct obd_client_handle *och, struct inode *inode, 
		lock_res_and_lock(lock);

		cancelled = ldlm_is_cancel(lock);

		unlock_res_and_lock(lock);

		ldlm_lock_put(lock);

		LDLM_LOCK_PUT(lock);

	}



	CDEBUG(D_INODE, "lease for " DFID " broken? %d\n",
@@ -2509,7 +2509,7 @@ ll_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
					rc = och->och_flags &

						(FMODE_READ | FMODE_WRITE);

				unlock_res_and_lock(lock);

				ldlm_lock_put(lock);

				LDLM_LOCK_PUT(lock);

			}

		}

		mutex_unlock(&lli->lli_och_mutex);

drivers/staging/lustre/lustre/mdc/mdc_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ static void mdc_hsm_release_pack(struct ptlrpc_request *req, 
		lock = ldlm_handle2lock(&op_data->op_lease_handle);

		if (lock) {

			data->cd_handle = lock->l_remote_handle;

			ldlm_lock_put(lock);

			LDLM_LOCK_PUT(lock);

		}

		ldlm_cli_cancel(&op_data->op_lease_handle, LCF_LOCAL);