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

Commit b9c98cfa authored by Fabio Falzoi's avatar Fabio Falzoi Committed by Greg Kroah-Hartman
Browse files

Staging: lustre: ops structs should be declared static 



Fixed the following sparse complaints:

drivers/staging/lustre/lustre/ptlrpc/../../lustre/ldlm/ldlm_pool.c:549:22:
	warning: symbol 'ldlm_srv_pool_ops' was not declared. Should it be static?
drivers/staging/lustre/lustre/ptlrpc/../../lustre/ldlm/ldlm_pool.c:555:22:
	warning: symbol 'ldlm_cli_pool_ops' was not declared. Should it be static?
drivers/staging/lustre/lustre/ptlrpc/../../lustre/ldlm/ldlm_pool.c:681:1:
	warning: symbol 'lprocfs_pool_state_fops' was not declared. Should it be static?
drivers/staging/lustre/lustre/ptlrpc/../../lustre/ldlm/ldlm_pool.c:697:1:
	warning: symbol 'lprocfs_grant_plan_fops' was not declared. Should it be static?
drivers/staging/lustre/lustre/ptlrpc/../../lustre/ldlm/ldlm_pool.c:700:1:
	warning: symbol 'lprocfs_wr_recalc_period' was not declared. Should it be static?
drivers/staging/lustre/lustre/ptlrpc/../../lustre/ldlm/ldlm_pool.c:708:1:
	warning: symbol 'lprocfs_recalc_period_fops' was not declared. Should it be static?
drivers/staging/lustre/lustre/ptlrpc/../../lustre/ldlm/ldlm_pool.c:710:1:
	warning: symbol 'ldlm_pool_u64_fops' was not declared. Should it be static?
drivers/staging/lustre/lustre/ptlrpc/../../lustre/ldlm/ldlm_pool.c:711:1:
	warning: symbol 'ldlm_pool_atomic_fops' was not declared. Should it be static?
drivers/staging/lustre/lustre/ptlrpc/../../lustre/ldlm/ldlm_pool.c:712:1:
	warning: symbol 'ldlm_pool_rw_atomic_fops' was not declared. Should it be static?
drivers/staging/lustre/lustre/ptlrpc/../../lustre/ldlm/ldlm_pool.c:714:1:
	warning: symbol 'lprocfs_grant_speed_fops' was not declared. Should it be static?

Signed-off-by: default avatarFabio Falzoi <fabio.falzoi84@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3eb84460

drivers/staging/lustre/lustre/include/lprocfs_status.h

+2 −2
Original line number Diff line number Diff line
@@ -687,7 +687,7 @@ static int name##_single_open(cfs_inode_t *inode, struct file *file) \ 
{									\

	return single_open(file, name##_seq_show, PDE_DATA(inode));	\

}									\

struct file_operations name##_fops = {				     \

static struct file_operations name##_fops = {				\

	.owner   = THIS_MODULE,					    \

	.open    = name##_single_open,				     \

	.read    = seq_read,					       \
@@ -730,7 +730,7 @@ struct file_operations name##_fops = { \ 
	{								\

		return single_open(file, NULL, PDE_DATA(inode));	\

	}								\

	struct file_operations name##_##type##_fops = {			\

	static struct file_operations name##_##type##_fops = {	\

		.open	= name##_##type##_open,				\

		.write	= name##_##type##_write,			\

		.release = lprocfs_single_release,			\

drivers/staging/lustre/lustre/include/lustre_dlm.h

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ struct ldlm_pool { 
	/** Recalculation period for pool. */

	time_t			pl_recalc_period;

	/** Recalculation and shrink operations. */

	struct ldlm_pool_ops	*pl_ops;

	const struct ldlm_pool_ops	*pl_ops;

	/** Number of planned locks for next period. */

	int			pl_grant_plan;

	/** Pool statistics. */

drivers/staging/lustre/lustre/ldlm/ldlm_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ typedef enum ldlm_policy_res ldlm_policy_res_t; 
	struct __##var##__dummy_read {;} /* semicolon catcher */



#define LDLM_POOL_PROC_WRITER(var, type)				    \

	int lprocfs_wr_##var(struct file *file, const char *buffer,	    \

	static int lprocfs_wr_##var(struct file *file, const char *buffer,  \

			     unsigned long count, void *data)		    \

	{								    \

		struct ldlm_pool *pl = data;				    \

drivers/staging/lustre/lustre/ldlm/ldlm_pool.c

+2 −2
Original line number Diff line number Diff line
@@ -546,13 +546,13 @@ static int ldlm_cli_pool_shrink(struct ldlm_pool *pl, 
		return ldlm_cancel_lru(ns, nr, LCF_ASYNC, LDLM_CANCEL_SHRINK);

}



struct ldlm_pool_ops ldlm_srv_pool_ops = {

static const struct ldlm_pool_ops ldlm_srv_pool_ops = {

	.po_recalc = ldlm_srv_pool_recalc,

	.po_shrink = ldlm_srv_pool_shrink,

	.po_setup  = ldlm_srv_pool_setup

};



struct ldlm_pool_ops ldlm_cli_pool_ops = {

static const struct ldlm_pool_ops ldlm_cli_pool_ops = {

	.po_recalc = ldlm_cli_pool_recalc,

	.po_shrink = ldlm_cli_pool_shrink

};

drivers/staging/lustre/lustre/llite/lproc_llite.c

+3 −3
Original line number Diff line number Diff line
@@ -44,9 +44,9 @@ 


/* /proc/lustre/llite mount point registration */

extern struct file_operations vvp_dump_pgcache_file_ops;

struct file_operations ll_rw_extents_stats_fops;

struct file_operations ll_rw_extents_stats_pp_fops;

struct file_operations ll_rw_offset_stats_fops;

static struct file_operations ll_rw_extents_stats_fops;

static struct file_operations ll_rw_extents_stats_pp_fops;

static struct file_operations ll_rw_offset_stats_fops;



static int ll_blksize_seq_show(struct seq_file *m, void *v)

{