From b0f3edd149cc22bae817e4056ab3657bdb724082 Mon Sep 17 00:00:00 2001
From: Patrick Caulfield <pcaulfie@redhat.com>
Date: Tue, 8 Aug 2006 10:34:40 -0400
Subject: [PATCH] --- yaml --- r: 38780 b: refs/heads/master c:
 cc346d555f2c3eb4a63b2df6bf9c9947f0a92a01 h: refs/heads/master v: v3

---
 [refs]              | 2 +-
 trunk/fs/dlm/lock.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0f8aed94bdd3..434269ff3859 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b557f6dc7899a0f6afc0169534346f8fa977a46
+refs/heads/master: cc346d555f2c3eb4a63b2df6bf9c9947f0a92a01
diff --git a/trunk/fs/dlm/lock.c b/trunk/fs/dlm/lock.c
index 7d38f914c5b9..bb2e35151210 100644
--- a/trunk/fs/dlm/lock.c
+++ b/trunk/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)