Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82353b59 authored by Adrian Bunk's avatar Adrian Bunk Committed by Joel Becker
Browse files

[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: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
parent b4e40a51

fs/ocfs2/cluster/sys.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

fs/ocfs2/dlm/dlmmaster.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

fs/ocfs2/dlm/dlmthread.c

+0 −3
Original line number Diff line number Diff line
@@ -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);