From e34e38c56dc3a8c4a399e868aedf81569361cbfc Mon Sep 17 00:00:00 2001
From: Benny Halevy <bhalevy@panasas.com>
Date: Mon, 30 Jun 2008 19:59:14 +0300
Subject: [PATCH] --- yaml --- r: 106905 b: refs/heads/master c:
 18c60c0a3b16fc7d6a55497a228602ad8509f838 h: refs/heads/master i:   106903:
 ab736d462f5c1a4df6b460960a2e3f23ba0f3be5 v: v3

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

diff --git a/[refs] b/[refs]
index da0d552647f9..613108aadbb8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 311f6fc77c51926dbdfbeab0a5d88d70f01fa3f4
+refs/heads/master: 18c60c0a3b16fc7d6a55497a228602ad8509f838
diff --git a/trunk/fs/dlm/lock.c b/trunk/fs/dlm/lock.c
index 7ba9586a0943..724ddac91538 100644
--- a/trunk/fs/dlm/lock.c
+++ b/trunk/fs/dlm/lock.c
@@ -363,6 +363,7 @@ static int search_rsb_list(struct list_head *head, char *name, int len,
 		if (len == r->res_length && !memcmp(name, r->res_name, len))
 			goto found;
 	}
+	*r_ret = NULL;
 	return -EBADR;
 
  found: