summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2008-11-10 16:24:57 -0600
committerMark Fasheh <mfasheh@suse.com>2008-12-01 14:46:39 -0800
commit66f502a416f18cd36179290746aa53736c6b2828 (patch)
tree30b538d2310b49cbcda079f6010c5850d6a146c0 /fs
parent3b5da0189c93160e44b878d2c72e9552d642497c (diff)
downloadlinux-stable-66f502a416f18cd36179290746aa53736c6b2828.tar.gz
linux-stable-66f502a416f18cd36179290746aa53736c6b2828.tar.bz2
linux-stable-66f502a416f18cd36179290746aa53736c6b2828.zip
ocfs2: initialize stack_user lvbptr
The locking_state dump, ocfs2_dlm_seq_show, reads the lvb on locks where it has not yet been initialized by a lock call. Signed-off-by: David Teigland <teigland@redhat.com> Acked-by: Joel Becker <joel.becker@oracle.com> Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/ocfs2/stack_user.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/ocfs2/stack_user.c b/fs/ocfs2/stack_user.c
index faec2d879357..9b76d41a8ac6 100644
--- a/fs/ocfs2/stack_user.c
+++ b/fs/ocfs2/stack_user.c
@@ -740,6 +740,9 @@ static int user_dlm_lock_status(union ocfs2_dlm_lksb *lksb)
static void *user_dlm_lvb(union ocfs2_dlm_lksb *lksb)
{
+ if (!lksb->lksb_fsdlm.sb_lvbptr)
+ lksb->lksb_fsdlm.sb_lvbptr = (char *)lksb +
+ sizeof(struct dlm_lksb);
return (void *)(lksb->lksb_fsdlm.sb_lvbptr);
}