From 26b785f34cafc10a0b3b37e37e19962d0bb1f4f5 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Sun, 17 Feb 2008 10:20:41 +0200
Subject: [PATCH] --- yaml --- r: 86765 b: refs/heads/master c:
 05488bbebe3deedbc5d58a1832f563ff96bc2ef6 h: refs/heads/master i:   86763:
 923f166be94d6b5ba5a8685d3f154bd54351dffd v: v3

---
 [refs]                         | 2 +-
 trunk/fs/ocfs2/dlm/dlmmaster.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 91e53d156a9b..abd8dee64ae2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 200bfae37a15e50e0f9aa5683958bdfc3fd55e05
+refs/heads/master: 05488bbebe3deedbc5d58a1832f563ff96bc2ef6
diff --git a/trunk/fs/ocfs2/dlm/dlmmaster.c b/trunk/fs/ocfs2/dlm/dlmmaster.c
index a54d33d95ada..c92d1b19fc0b 100644
--- a/trunk/fs/ocfs2/dlm/dlmmaster.c
+++ b/trunk/fs/ocfs2/dlm/dlmmaster.c
@@ -1695,9 +1695,9 @@ int dlm_master_request_handler(struct o2net_msg *msg, u32 len, void *data,
  * can periodically run all locks owned by this node
  * and re-assert across the cluster...
  */
-int dlm_do_assert_master(struct dlm_ctxt *dlm,
-			 struct dlm_lock_resource *res,
-			 void *nodemap, u32 flags)
+static int dlm_do_assert_master(struct dlm_ctxt *dlm,
+				struct dlm_lock_resource *res,
+				void *nodemap, u32 flags)
 {
 	struct dlm_assert_master assert;
 	int to, tmpret;