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

Commit faf0ec9f authored by Adrian Bunk's avatar Adrian Bunk Committed by Mark Fasheh
Browse files

[PATCH] fs/ocfs2/dlm/: make functions static 



This patch makes some needlessly global functions static.

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
parent ba2bf218

fs/ocfs2/dlm/dlmcommon.h

+0 −6
Original line number Diff line number Diff line
@@ -739,8 +739,6 @@ void __dlm_lockres_calc_usage(struct dlm_ctxt *dlm, 
			      struct dlm_lock_resource *res);

void dlm_lockres_calc_usage(struct dlm_ctxt *dlm,

			    struct dlm_lock_resource *res);

int dlm_purge_lockres(struct dlm_ctxt *dlm,

		      struct dlm_lock_resource *lockres);

static inline void dlm_lockres_get(struct dlm_lock_resource *res)

{

	/* This is called on every lookup, so it might be worth
@@ -864,10 +862,6 @@ int dlm_heartbeat_init(struct dlm_ctxt *dlm); 
void dlm_hb_node_down_cb(struct o2nm_node *node, int idx, void *data);

void dlm_hb_node_up_cb(struct o2nm_node *node, int idx, void *data);



int dlm_lockres_is_dirty(struct dlm_ctxt *dlm, struct dlm_lock_resource *res);

int dlm_migrate_lockres(struct dlm_ctxt *dlm,

			struct dlm_lock_resource *res,

			u8 target);

int dlm_empty_lockres(struct dlm_ctxt *dlm, struct dlm_lock_resource *res);

int dlm_finish_migration(struct dlm_ctxt *dlm,

			 struct dlm_lock_resource *res,

fs/ocfs2/dlm/dlmmaster.c

+5 −3
Original line number Diff line number Diff line
@@ -2327,7 +2327,8 @@ int dlm_deref_lockres_handler(struct o2net_msg *msg, u32 len, void *data) 
 */





int dlm_migrate_lockres(struct dlm_ctxt *dlm, struct dlm_lock_resource *res,

static int dlm_migrate_lockres(struct dlm_ctxt *dlm,

			       struct dlm_lock_resource *res,

			       u8 target)

{

	struct dlm_master_list_entry *mle = NULL;
@@ -2676,7 +2677,8 @@ static int dlm_migration_can_proceed(struct dlm_ctxt *dlm, 
	return can_proceed;

}



int dlm_lockres_is_dirty(struct dlm_ctxt *dlm, struct dlm_lock_resource *res)

static int dlm_lockres_is_dirty(struct dlm_ctxt *dlm,

				struct dlm_lock_resource *res)

{

	int ret;

	spin_lock(&res->spinlock);

fs/ocfs2/dlm/dlmthread.c

+2 −1
Original line number Diff line number Diff line
@@ -154,7 +154,8 @@ void dlm_lockres_calc_usage(struct dlm_ctxt *dlm, 
	spin_unlock(&dlm->spinlock);

}



int dlm_purge_lockres(struct dlm_ctxt *dlm, struct dlm_lock_resource *res)

static int dlm_purge_lockres(struct dlm_ctxt *dlm,

			     struct dlm_lock_resource *res)

{

	int master;

	int ret = 0;