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

Commit 41e1f1fe authored by NeilBrown's avatar NeilBrown Committed by Greg Kroah-Hartman
Browse files

staging: lustre: ldlm: free resource when ldlm_lock_create() fails. 



[ Upstream commit d8caf662b4aeeb2ac83ac0b22e40db88e9360c77 ]

ldlm_lock_create() gets a resource, but don't put it on
all failure paths. It should.

Signed-off-by: default avatarNeilBrown <neilb@suse.com>
Reviewed-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e906355a

drivers/staging/lustre/lustre/ldlm/ldlm_lock.c

+5 −1
Original line number Diff line number Diff line
@@ -1571,8 +1571,10 @@ struct ldlm_lock *ldlm_lock_create(struct ldlm_namespace *ns, 
		return ERR_CAST(res);



	lock = ldlm_lock_new(res);

	if (!lock)

	if (!lock) {

		ldlm_resource_putref(res);

		return ERR_PTR(-ENOMEM);

	}



	lock->l_req_mode = mode;

	lock->l_ast_data = data;
@@ -1615,6 +1617,8 @@ struct ldlm_lock *ldlm_lock_create(struct ldlm_namespace *ns, 
	return ERR_PTR(rc);

}







/**

 * Enqueue (request) a lock.

 * On the client this is called from ldlm_cli_enqueue_fini