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

Commit fa9df8e3 authored by Shraddha Barke's avatar Shraddha Barke Committed by Greg Kroah-Hartman
Browse files

Staging: lustre: obdclass: obd_mount: Declare as static 



Declare lustre_fs_type, do_lcfg, lustre_fill_super, lustre_put_lsi,
lustre_init_lsi, lustre_start_simple, server_name2index and
server_name2fsname as static since they are used only in this
particular file.Also remove corresponding declarations from header
files.

Signed-off-by: default avatarShraddha Barke <shraddha.6596@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 28fcc662

drivers/staging/lustre/lustre/include/lustre_disk.h

+0 −5
Original line number Diff line number Diff line
@@ -383,12 +383,7 @@ struct lustre_mount_info { 
/****************** prototypes *********************/



/* obd_mount.c */

int server_name2fsname(const char *svname, char *fsname, const char **endptr);

int server_name2index(const char *svname, __u32 *idx, const char **endptr);



int lustre_put_lsi(struct super_block *sb);

int lustre_start_simple(char *obdname, char *type, char *uuid,

			char *s1, char *s2, char *s3, char *s4);

int lustre_start_mgc(struct super_block *sb);

void lustre_register_client_fill_super(int (*cfs)(struct super_block *sb,

						  struct vfsmount *mnt));

drivers/staging/lustre/lustre/include/lustre_param.h

+0 −3
Original line number Diff line number Diff line
@@ -58,9 +58,6 @@ struct cfg_interop_param { 
int class_find_param(char *buf, char *key, char **valp);

int class_parse_nid(char *buf, lnet_nid_t *nid, char **endh);

int class_parse_nid_quiet(char *buf, lnet_nid_t *nid, char **endh);

/* obd_mount.c */

int do_lcfg(char *cfgname, lnet_nid_t nid, int cmd,

	    char *s1, char *s2, char *s3, char *s4);

drivers/staging/lustre/lustre/obdclass/obd_mount.c

+12 −13
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ EXPORT_SYMBOL(lustre_end_log); 
/** lustre_cfg_bufs are a holdover from 1.4; we can still set these up from

 * lctl (and do for echo cli/srv.

 */

int do_lcfg(char *cfgname, lnet_nid_t nid, int cmd,

static int do_lcfg(char *cfgname, lnet_nid_t nid, int cmd,

		   char *s1, char *s2, char *s3, char *s4)

{

	struct lustre_cfg_bufs bufs;
@@ -169,12 +169,11 @@ int do_lcfg(char *cfgname, lnet_nid_t nid, int cmd, 
	lustre_cfg_free(lcfg);

	return rc;

}

EXPORT_SYMBOL(do_lcfg);



/** Call class_attach and class_setup.  These methods in turn call

 * obd type-specific methods.

 */

int lustre_start_simple(char *obdname, char *type, char *uuid,

static int lustre_start_simple(char *obdname, char *type, char *uuid,

			       char *s1, char *s2, char *s3, char *s4)

{

	int rc;
@@ -488,7 +487,7 @@ static int lustre_stop_mgc(struct super_block *sb) 


/***************** lustre superblock **************/



struct lustre_sb_info *lustre_init_lsi(struct super_block *sb)

static struct lustre_sb_info *lustre_init_lsi(struct super_block *sb)

{

	struct lustre_sb_info *lsi;
@@ -547,7 +546,7 @@ static int lustre_free_lsi(struct super_block *sb) 


/* The lsi has one reference for every server that is using the disk -

   e.g. MDT, MGS, and potentially MGC */

int lustre_put_lsi(struct super_block *sb)

static int lustre_put_lsi(struct super_block *sb)

{

	struct lustre_sb_info *lsi = s2lsi(sb);
@@ -577,7 +576,8 @@ int lustre_put_lsi(struct super_block *sb) 
 * @param [out] endptr if endptr isn't NULL it is set to end of fsname

 * rc < 0  on error

 */

int server_name2fsname(const char *svname, char *fsname, const char **endptr)

static int server_name2fsname(const char *svname, char *fsname,

			      const char **endptr)

{

	const char *dash;
@@ -597,13 +597,13 @@ int server_name2fsname(const char *svname, char *fsname, const char **endptr) 


	return 0;

}

EXPORT_SYMBOL(server_name2fsname);



/* Get the index from the obd name.

   rc = server type, or

   rc < 0  on error

   if endptr isn't NULL it is set to end of name */

int server_name2index(const char *svname, __u32 *idx, const char **endptr)

static int server_name2index(const char *svname, __u32 *idx,

			     const char **endptr)

{

	unsigned long index;

	int rc;
@@ -642,7 +642,6 @@ int server_name2index(const char *svname, __u32 *idx, const char **endptr) 


	return rc;

}

EXPORT_SYMBOL(server_name2index);



/*************** mount common between server and client ***************/
@@ -1074,7 +1073,7 @@ struct lustre_mount_data2 { 
 * and this is where we start setting things up.

 * @param data Mount options (e.g. -o flock,abort_recov)

 */

int lustre_fill_super(struct super_block *sb, void *data, int silent)

static int lustre_fill_super(struct super_block *sb, void *data, int silent)

{

	struct lustre_mount_data *lmd;

	struct lustre_mount_data2 *lmd2 = data;
@@ -1185,7 +1184,7 @@ static void lustre_kill_super(struct super_block *sb) 


/** Register the "lustre" fs type

 */

struct file_system_type lustre_fs_type = {

static struct file_system_type lustre_fs_type = {

	.owner	= THIS_MODULE,

	.name	 = "lustre",

	.mount	= lustre_mount,