summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2005-12-19 11:16:07 -0800
committerJoel Becker <joel.becker@oracle.com>2006-01-03 11:45:55 -0800
commit82353b594c784deabb8d9764b477e65c2b3726f9 (patch)
tree9182f0ac8aeca6ab49953da7c346a74d5853bd94
parentb4e40a51881931bfcbc78a585e875bb2784d6d10 (diff)
downloadop-kernel-dev-82353b594c784deabb8d9764b477e65c2b3726f9.zip
op-kernel-dev-82353b594c784deabb8d9764b477e65c2b3726f9.tar.gz
[PATCH] 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: Adrian Bunk <bunk@stusta.de> Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
-rw-r--r--fs/ocfs2/cluster/sys.c4
-rw-r--r--fs/ocfs2/dlm/dlmmaster.c4
-rw-r--r--fs/ocfs2/dlm/dlmthread.c3
3 files changed, 3 insertions, 8 deletions
diff --git a/fs/ocfs2/cluster/sys.c b/fs/ocfs2/cluster/sys.c
index f1e9946..1d9f6ac 100644
--- a/fs/ocfs2/cluster/sys.c
+++ b/fs/ocfs2/cluster/sys.c
@@ -50,7 +50,7 @@ static ssize_t o2cb_interface_revision_show(char *buf)
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 @@ static struct kobj_type o2cb_subsys_type = {
};
/* 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)
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index 0472795..27e984f 100644
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
@@ -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 @@ static void dlm_dump_mles(struct dlm_ctxt *dlm)
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;
diff --git a/fs/ocfs2/dlm/dlmthread.c b/fs/ocfs2/dlm/dlmthread.c
index 92cd5cd..5be9d14 100644
--- a/fs/ocfs2/dlm/dlmthread.c
+++ b/fs/ocfs2/dlm/dlmthread.c
@@ -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);
OpenPOWER on IntegriCloud