From bea5b5c5ff233950e19d20870184926d8dd39775 Mon Sep 17 00:00:00 2001
From: David Teigland <teigland@redhat.com>
Date: Thu, 21 Feb 2008 11:25:42 -0600
Subject: [PATCH] --- yaml --- r: 91870 b: refs/heads/master c:
 761b9d3ffc953c24ceb55d8e12ff7e02b17e0484 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 6010206a8868..27dcdb7eb16b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 170e19ab2900b7c959d7a0e627fd12f383efcfa1
+refs/heads/master: 761b9d3ffc953c24ceb55d8e12ff7e02b17e0484
diff --git a/trunk/fs/dlm/lock.c b/trunk/fs/dlm/lock.c
index 1e9e8ebee251..2d3d1027ce2b 100644
--- a/trunk/fs/dlm/lock.c
+++ b/trunk/fs/dlm/lock.c
@@ -1956,8 +1956,7 @@ static void confirm_master(struct dlm_rsb *r, int error)
 			list_del_init(&lkb->lkb_rsb_lookup);
 			r->res_first_lkid = lkb->lkb_id;
 			_request_lock(r, lkb);
-		} else
-			r->res_nodeid = -1;
+		}
 		break;
 
 	default: