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

Commit af78e1e8 authored by Baoyou Xie's avatar Baoyou Xie Committed by Greg Kroah-Hartman
Browse files

staging: lustre: obdclass: clean function declarations in obd_config.c and class_obd.c up 



We get 3 warnings when building kernel with W=1:

drivers/staging/lustre/lustre/obdclass/obd_mount.c:705:5: warning: no previous prototype for 'lustre_check_exclusion' [-Wmissing-prototypes]
drivers/staging/lustre/lustre/obdclass/obd_mount.c:1226:5: warning: no previous prototype for 'lustre_register_fs' [-Wmissing-prototypes]
drivers/staging/lustre/lustre/obdclass/obd_mount.c:1231:5: warning: no previous prototype for 'lustre_unregister_fs' [-Wmissing-prototypes]

In fact, the first function is declared in
drivers/staging/lustre/lustre/obdclass/obd_config.c,
and the other two functions are declared in
drivers/staging/lustre/lustre/obdclass/class_obd.c,
but all of these functions should be declared in
a header file, thus can be recognized in other file.

So this patch moves the declarations into
drivers/staging/lustre/lustre/include/obd_class.h.

Signed-off-by: default avatarBaoyou Xie <baoyou.xie@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c2e1b91e

drivers/staging/lustre/lustre/include/obd_class.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -1696,6 +1696,9 @@ struct lwp_register_item { 
extern int (*ptlrpc_put_connection_superhack)(struct ptlrpc_connection *c);

extern int (*ptlrpc_put_connection_superhack)(struct ptlrpc_connection *c);





/* obd_mount.c */

/* obd_mount.c */

int lustre_unregister_fs(void);

int lustre_register_fs(void);

int lustre_check_exclusion(struct super_block *sb, char *svname);





/* sysctl.c */

/* sysctl.c */

int obd_sysctl_init(void);

int obd_sysctl_init(void);

drivers/staging/lustre/lustre/obdclass/class_obd.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -450,8 +450,6 @@ static int __init obdclass_init(void) 
{

{

	int i, err;

	int i, err;





	int lustre_register_fs(void);



	LCONSOLE_INFO("Lustre: Build Version: " LUSTRE_VERSION_STRING "\n");

	LCONSOLE_INFO("Lustre: Build Version: " LUSTRE_VERSION_STRING "\n");





	spin_lock_init(&obd_types_lock);

	spin_lock_init(&obd_types_lock);
@@ -518,8 +516,6 @@ static int __init obdclass_init(void) 




static void obdclass_exit(void)

static void obdclass_exit(void)

{

{

	int lustre_unregister_fs(void);



	lustre_unregister_fs();

	lustre_unregister_fs();





	misc_deregister(&obd_psdev);

	misc_deregister(&obd_psdev);

drivers/staging/lustre/lustre/obdclass/obd_config.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -1047,8 +1047,6 @@ int class_process_proc_param(char *prefix, struct lprocfs_vars *lvars, 
}

}

EXPORT_SYMBOL(class_process_proc_param);

EXPORT_SYMBOL(class_process_proc_param);





extern int lustre_check_exclusion(struct super_block *sb, char *svname);



/** Parse a configuration llog, doing various manipulations on them

/** Parse a configuration llog, doing various manipulations on them

 * for various reasons, (modifications for compatibility, skip obsolete

 * for various reasons, (modifications for compatibility, skip obsolete

 * records, change uuids, etc), then class_process_config() resulting

 * records, change uuids, etc), then class_process_config() resulting