From: Patrick Caulfield <pcaulfie@redhat.com>
Date: Tue, 8 Aug 2006 14:34:40 +0000 (-0400)
Subject: [DLM] fix userland unlock
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=cc346d555f2c3eb4a63b2df6bf9c9947f0a92a01;p=deliverable%2Flinux.git

[DLM] fix userland unlock

This patch fixes the userland DLM unlock code so that it correctly returns the
address of the userland lock status block in its completion AST.

It fixes bug #201348

Patrick

Signed-Off-By: Patrick Caulfield <pcaulfie@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
---

diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
index 7d38f914c5b9..bb2e35151210 100644
--- a/fs/dlm/lock.c
+++ b/fs/dlm/lock.c
@@ -3699,6 +3699,7 @@ int dlm_user_unlock(struct dlm_ls *ls, struct dlm_user_args *ua_tmp,
 	if (lvb_in && ua->lksb.sb_lvbptr)
 		memcpy(ua->lksb.sb_lvbptr, lvb_in, DLM_USER_LVB_LEN);
 	ua->castparam = ua_tmp->castparam;
+	ua->user_lksb = ua_tmp->user_lksb;
 
 	error = set_unlock_args(flags, ua, &args);
 	if (error)