From: Patrick Caulfield <pcaulfie@redhat.com>
Date: Wed, 23 Aug 2006 08:49:31 +0000 (+0100)
Subject: [DLM] preserve lksb address in user conversions
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=10948eb4eddea6750a3b27f77bec423d844e6726;p=mv-sheeva.git

[DLM] preserve lksb address in user conversions

This patch fixes bz#203444 where the LKSB was lost during userland conversion
operations

Signed-off-by: Patrick Caulfield <pcaulfie@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
---

diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
index 712438513cc..7ffbe8090de 100644
--- a/fs/dlm/lock.c
+++ b/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,