From 0ae6c24565f68b697e4aea29452f6150ec12e115 Mon Sep 17 00:00:00 2001
From: David Teigland <teigland@redhat.com>
Date: Thu, 20 Jul 2006 09:06:34 -0500
Subject: [PATCH] --- yaml --- r: 38756 b: refs/heads/master c:
 c5921fd02e6c720938141a45f1f9dbd71b17fff2 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/fs/gfs2/locking/dlm/lock.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e080fc297a27..77b863a8e42f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36098198184b0644537f4b2257d861e9bdf124bd
+refs/heads/master: c5921fd02e6c720938141a45f1f9dbd71b17fff2
diff --git a/trunk/fs/gfs2/locking/dlm/lock.c b/trunk/fs/gfs2/locking/dlm/lock.c
index e74f1215672f..f769eac1a34a 100644
--- a/trunk/fs/gfs2/locking/dlm/lock.c
+++ b/trunk/fs/gfs2/locking/dlm/lock.c
@@ -430,7 +430,7 @@ static int hold_null_lock(struct gdlm_lock *lp)
 	init_completion(&lpn->ast_wait);
 	gdlm_do_lock(lpn);
 	wait_for_completion(&lpn->ast_wait);
-	error = lp->lksb.sb_status;
+	error = lpn->lksb.sb_status;
 	if (error) {
 		printk(KERN_INFO "lock_dlm: hold_null_lock dlm error %d\n",
 		       error);