From 8f7cb11da233efb9e639cc13fd08e1aa708b4c4c Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Mon, 21 Apr 2008 11:49:37 +0300
Subject: [PATCH] --- yaml --- r: 95839 b: refs/heads/master c:
 95642e56647d84963428a1168baa8a73cb782ac3 h: refs/heads/master i:   95837:
 09beb81a5a4e5360ae6a9ebf2ad763619fa5ce7f   95835:
 e6d38bc67f0a2245c52f735d09b61fc52f3e2943   95831:
 25a5f7901f136d0eb3cc06988ab4c22acf718748   95823:
 cd9034df9ab5037a35f7f771371fa177af4e8fa7   95807:
 aecad7cfd20b4d290b6b1269b7c8c4019b2a4841 v: v3

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

diff --git a/[refs] b/[refs]
index 25019421db0c..827f70bdbde1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4af694e672aaa85940d6e29d27b7eeea5f6eb258
+refs/heads/master: 95642e56647d84963428a1168baa8a73cb782ac3
diff --git a/trunk/fs/ocfs2/dlm/dlmdebug.c b/trunk/fs/ocfs2/dlm/dlmdebug.c
index 5f6d858770a2..1b81dcba175d 100644
--- a/trunk/fs/ocfs2/dlm/dlmdebug.c
+++ b/trunk/fs/ocfs2/dlm/dlmdebug.c
@@ -44,7 +44,8 @@
 #define MLOG_MASK_PREFIX ML_DLM
 #include "cluster/masklog.h"
 
-int stringify_lockname(const char *lockname, int locklen, char *buf, int len);
+static int stringify_lockname(const char *lockname, int locklen, char *buf,
+			      int len);
 
 void dlm_print_one_lock_resource(struct dlm_lock_resource *res)
 {
@@ -251,7 +252,8 @@ EXPORT_SYMBOL_GPL(dlm_errname);
  *
  * For more on lockname formats, please refer to dlmglue.c and ocfs2_lockid.h.
  */
-int stringify_lockname(const char *lockname, int locklen, char *buf, int len)
+static int stringify_lockname(const char *lockname, int locklen, char *buf,
+			      int len)
 {
 	int out = 0;
 	__be64 inode_blkno_be;
@@ -368,7 +370,7 @@ static void dlm_debug_free(struct kref *kref)
 	kfree(dc);
 }
 
-void dlm_debug_put(struct dlm_debug_ctxt *dc)
+static void dlm_debug_put(struct dlm_debug_ctxt *dc)
 {
 	if (dc)
 		kref_put(&dc->debug_refcnt, dlm_debug_free);