summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Caulfield <pcaulfie@redhat.com>2006-08-08 10:34:40 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-08-08 10:34:40 -0400
commitcc346d555f2c3eb4a63b2df6bf9c9947f0a92a01 (patch)
tree9d1435929cedb6a7a4c5571dc6e40bdf0758dc62
parent2b557f6dc7899a0f6afc0169534346f8fa977a46 (diff)
downloadop-kernel-dev-cc346d555f2c3eb4a63b2df6bf9c9947f0a92a01.zip
op-kernel-dev-cc346d555f2c3eb4a63b2df6bf9c9947f0a92a01.tar.gz
[DLM] fix userland unlock
This patch fixes the userland DLM unlock code so that it correctly returns the address of the userland lock status block in its completion AST. It fixes bug #201348 Patrick Signed-Off-By: Patrick Caulfield <pcaulfie@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
-rw-r--r--fs/dlm/lock.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
index 7d38f91..bb2e351 100644
--- a/fs/dlm/lock.c
+++ b/fs/dlm/lock.c
@@ -3699,6 +3699,7 @@ 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;
+ ua->user_lksb = ua_tmp->user_lksb;
error = set_unlock_args(flags, ua, &args);
if (error)
OpenPOWER on IntegriCloud