---

yaml --- r: 38794 b: refs/heads/master c: c059f70 h: refs/heads/master v: v3
git-mirror · Aug 23, 2006 · c66fd64 · c66fd64
1 parent e73215b
commit c66fd64
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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)