From aa7006bdcb91947c3679614d19369bdf143854b4 Mon Sep 17 00:00:00 2001 From: Patrick Caulfield Date: Mon, 1 Oct 2007 15:28:42 +0100 Subject: [PATCH] --- yaml --- r: 67693 b: refs/heads/master c: b434eda6fda5bcdcc2dd918e5ffbf7184f2d4e17 h: refs/heads/master i: 67691: a2c697cfaa17a4c824f5097ef46fb2203e72487d v: v3 --- [refs] | 2 +- trunk/fs/dlm/lock.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 476c2d6d7846..86a16619b237 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a60c532c9224babc172fafccc9e2fec6937af6f +refs/heads/master: b434eda6fda5bcdcc2dd918e5ffbf7184f2d4e17 diff --git a/trunk/fs/dlm/lock.c b/trunk/fs/dlm/lock.c index 2082daf083d8..031229f144fa 100644 --- a/trunk/fs/dlm/lock.c +++ b/trunk/fs/dlm/lock.c @@ -4429,7 +4429,8 @@ 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; + if (ua_tmp->castparam) + ua->castparam = ua_tmp->castparam; ua->user_lksb = ua_tmp->user_lksb; error = set_unlock_args(flags, ua, &args); @@ -4474,7 +4475,8 @@ int dlm_user_cancel(struct dlm_ls *ls, struct dlm_user_args *ua_tmp, goto out; ua = (struct dlm_user_args *)lkb->lkb_astparam; - ua->castparam = ua_tmp->castparam; + if (ua_tmp->castparam) + ua->castparam = ua_tmp->castparam; ua->user_lksb = ua_tmp->user_lksb; error = set_unlock_args(flags, ua, &args);