From e73215bd3d6a19ec4fede973547c762e956a5d14 Mon Sep 17 00:00:00 2001 From: Patrick Caulfield Date: Wed, 23 Aug 2006 09:49:31 +0100 Subject: [PATCH] --- yaml --- r: 38793 b: refs/heads/master c: 10948eb4eddea6750a3b27f77bec423d844e6726 h: refs/heads/master i: 38791: 1fcd7869cd605b2b0e7a86ff5697366d16fa3a7c v: v3 --- [refs] | 2 +- trunk/fs/dlm/lock.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 235df480377b..d4065293a74b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b8e1aabf218a2037d9d6a3256c33fc6ef96ac44c +refs/heads/master: 10948eb4eddea6750a3b27f77bec423d844e6726 diff --git a/trunk/fs/dlm/lock.c b/trunk/fs/dlm/lock.c index 712438513cc4..7ffbe8090de0 100644 --- a/trunk/fs/dlm/lock.c +++ b/trunk/fs/dlm/lock.c @@ -3683,6 +3683,7 @@ int dlm_user_convert(struct dlm_ls *ls, struct dlm_user_args *ua_tmp, ua->castaddr = ua_tmp->castaddr; ua->bastparam = ua_tmp->bastparam; ua->bastaddr = ua_tmp->bastaddr; + ua->user_lksb = ua_tmp->user_lksb; ua->old_mode = lkb->lkb_grmode; error = set_lock_args(mode, &ua->lksb, flags, 0, 0, FAKE_USER_AST, ua,