From 02e6a17a95bfcee7b179cae3e05dab2a2092a40c Mon Sep 17 00:00:00 2001
From: David Teigland <teigland@redhat.com>
Date: Mon, 23 Apr 2012 14:08:52 -0500
Subject: [PATCH] --- yaml --- r: 305196 b: refs/heads/master c:
 57638bf3aa64facd9eba0e018b5773f5d2da6c2b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 713055714530..f6da8499229e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6e24788d21c4f1a8f00c811c31dd4e9a58679ac
+refs/heads/master: 57638bf3aa64facd9eba0e018b5773f5d2da6c2b
diff --git a/trunk/fs/dlm/lock.c b/trunk/fs/dlm/lock.c
index 3d35c593f4c1..49926f1df23e 100644
--- a/trunk/fs/dlm/lock.c
+++ b/trunk/fs/dlm/lock.c
@@ -479,6 +479,9 @@ static int _search_rsb(struct dlm_ls *ls, char *name, int len, int b,
 		kref_get(&r->res_ref);
 		goto out;
 	}
+	if (error == -ENOTBLK)
+		goto out;
+
 	error = dlm_search_rsb_tree(&ls->ls_rsbtbl[b].toss, name, len, flags, &r);
 	if (error)
 		goto out;