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

Commit e028398d authored by Adrian Bunk's avatar Adrian Bunk Committed by David Teigland
Browse files

dlm: proper prototypes 



This patch adds a proper prototype for some functions in
fs/dlm/dlm_internal.h

Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
parent 6bd8feda

fs/dlm/dlm_internal.h

+16 −0
Original line number Diff line number Diff line
@@ -570,5 +570,21 @@ static inline int dlm_no_directory(struct dlm_ls *ls) 
	return (ls->ls_exflags & DLM_LSFL_NODIR) ? 1 : 0;

}



int dlm_netlink_init(void);

void dlm_netlink_exit(void);

void dlm_timeout_warn(struct dlm_lkb *lkb);



#ifdef CONFIG_DLM_DEBUG

int dlm_register_debugfs(void);

void dlm_unregister_debugfs(void);

int dlm_create_debug_file(struct dlm_ls *ls);

void dlm_delete_debug_file(struct dlm_ls *ls);

#else

static inline int dlm_register_debugfs(void) { return 0; }

static inline void dlm_unregister_debugfs(void) { }

static inline int dlm_create_debug_file(struct dlm_ls *ls) { return 0; }

static inline void dlm_delete_debug_file(struct dlm_ls *ls) { }

#endif



#endif				/* __DLM_INTERNAL_DOT_H__ */

fs/dlm/lock.c

+0 −1
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ static void __receive_convert_reply(struct dlm_rsb *r, struct dlm_lkb *lkb, 
static int receive_extralen(struct dlm_message *ms);

static void do_purge(struct dlm_ls *ls, int nodeid, int pid);

static void del_timeout(struct dlm_lkb *lkb);

void dlm_timeout_warn(struct dlm_lkb *lkb);



/*

 * Lock compatibilty matrix - thanks Steve

fs/dlm/lockspace.c

+0 −8
Original line number Diff line number Diff line
@@ -24,14 +24,6 @@ 
#include "recover.h"

#include "requestqueue.h"



#ifdef CONFIG_DLM_DEBUG

int dlm_create_debug_file(struct dlm_ls *ls);

void dlm_delete_debug_file(struct dlm_ls *ls);

#else

static inline int dlm_create_debug_file(struct dlm_ls *ls) { return 0; }

static inline void dlm_delete_debug_file(struct dlm_ls *ls) { }

#endif



static int			ls_count;

static struct mutex		ls_lock;

static struct list_head		lslist;

fs/dlm/main.c

+0 −10
Original line number Diff line number Diff line
@@ -18,16 +18,6 @@ 
#include "memory.h"

#include "config.h"



#ifdef CONFIG_DLM_DEBUG

int dlm_register_debugfs(void);

void dlm_unregister_debugfs(void);

#else

static inline int dlm_register_debugfs(void) { return 0; }

static inline void dlm_unregister_debugfs(void) { }

#endif

int dlm_netlink_init(void);

void dlm_netlink_exit(void);



static int __init init_dlm(void)

{

	int error;