From c66fd64205e1d456b2d5061f02eb26693f9e5d56 Mon Sep 17 00:00:00 2001
From: Patrick Caulfield <pcaulfie@redhat.com>
Date: Wed, 23 Aug 2006 10:24:03 +0100
Subject: [PATCH] --- yaml --- r: 38794 b: refs/heads/master c:
 c059f70e357af1adcfc1a9294e44cdd945adb841 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 d4065293a74b..595d66414f6c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10948eb4eddea6750a3b27f77bec423d844e6726
+refs/heads/master: c059f70e357af1adcfc1a9294e44cdd945adb841
diff --git a/trunk/fs/dlm/lock.c b/trunk/fs/dlm/lock.c
index 7ffbe8090de0..6dcd475826c1 100644
--- a/trunk/fs/dlm/lock.c
+++ b/trunk/fs/dlm/lock.c
@@ -3765,6 +3765,7 @@ int dlm_user_cancel(struct dlm_ls *ls, struct dlm_user_args *ua_tmp,
 
 	ua = (struct dlm_user_args *)lkb->lkb_astparam;
 	ua->castparam = ua_tmp->castparam;
+	ua->user_lksb = ua_tmp->user_lksb;
 
 	error = set_unlock_args(flags, ua, &args);
 	if (error)