[Ocfs2-commits] mfasheh commits r2739 - in trunk/fs/ocfs2: cluster dlm

[svn-commits at oss.oracle.com]

Author: mfasheh
Signed-off-by: jlbec
Date: 2005-12-19 13:07:49 -0600 (Mon, 19 Dec 2005)
New Revision: 2739

Modified:
   trunk/fs/ocfs2/cluster/sys.c
   trunk/fs/ocfs2/dlm/dlmmaster.c
   trunk/fs/ocfs2/dlm/dlmthread.c
Log:
* commit a patch by Adrian Bunk <bunk at stusta.de>:

This patch contains the following cleanups:                                     
- cluster/sys.c: make needlessly global code static                             
- dlm/: "extern" declarations for variables belong into header files            
        (and in this case, they are already in dlmdomain.h)                     

Signed-off-by: jlbec



Modified: trunk/fs/ocfs2/cluster/sys.c
===================================================================
--- trunk/fs/ocfs2/cluster/sys.c	2005-12-14 17:16:16 UTC (rev 2738)
+++ trunk/fs/ocfs2/cluster/sys.c	2005-12-19 19:07:49 UTC (rev 2739)
@@ -50,7 +50,7 @@
 	return snprintf(buf, PAGE_SIZE, "%u\n", O2NM_API_VERSION);
 }
 
-O2CB_ATTR(interface_revision, S_IFREG | S_IRUGO, o2cb_interface_revision_show, NULL);
+static O2CB_ATTR(interface_revision, S_IFREG | S_IRUGO, o2cb_interface_revision_show, NULL);
 
 static struct attribute *o2cb_attrs[] = {
 	&o2cb_attr_interface_revision.attr,
@@ -73,7 +73,7 @@
 };
 
 /* gives us o2cb_subsys */
-decl_subsys(o2cb, NULL, NULL);
+static decl_subsys(o2cb, NULL, NULL);
 
 static ssize_t
 o2cb_show(struct kobject * kobj, struct attribute * attr, char * buffer)

Modified: trunk/fs/ocfs2/dlm/dlmmaster.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmmaster.c	2005-12-14 17:16:16 UTC (rev 2738)
+++ trunk/fs/ocfs2/dlm/dlmmaster.c	2005-12-19 19:07:49 UTC (rev 2739)
@@ -48,6 +48,7 @@
 #include "dlmapi.h"
 #include "dlmcommon.h"
 #include "dlmdebug.h"
+#include "dlmdomain.h"
 
 #define MLOG_MASK_PREFIX (ML_DLM|ML_DLM_MASTER)
 #include "cluster/masklog.h"
@@ -178,9 +179,6 @@
 	spin_unlock(&dlm->master_lock);
 }
 
-extern spinlock_t dlm_domain_lock;
-extern struct list_head dlm_domains;
-
 int dlm_dump_all_mles(const char __user *data, unsigned int len)
 {
 	struct list_head *iter;

Modified: trunk/fs/ocfs2/dlm/dlmthread.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmthread.c	2005-12-14 17:16:16 UTC (rev 2738)
+++ trunk/fs/ocfs2/dlm/dlmthread.c	2005-12-19 19:07:49 UTC (rev 2739)
@@ -52,9 +52,6 @@
 #define MLOG_MASK_PREFIX (ML_DLM|ML_DLM_THREAD)
 #include "cluster/masklog.h"
 
-extern spinlock_t dlm_domain_lock;
-extern struct list_head dlm_domains;
-
 static int dlm_thread(void *data);
 
 static void dlm_flush_asts(struct dlm_ctxt *dlm);