Commit 5cff0cc9 authored Oct 02, 2015 by Shraddha Barke Committed by Greg Kroah-Hartman Oct 04, 2015

Staging: lustre: ptlrpc: Declare sptlrpc_rule_set_merge as static



Declare sptlrpc_rule_set_merge as static since it is accessed from this
particular file only. Also remove its declaration from
header file

Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 801b798c

drivers/staging/lustre/lustre/include/lustre_sec.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -331,8 +331,6 @@ static inline void sptlrpc_rule_set_init(struct sptlrpc_rule_set *set)

		void sptlrpc_rule_set_free(struct sptlrpc_rule_set *set);
		int sptlrpc_rule_set_expand(struct sptlrpc_rule_set *set);
		int sptlrpc_rule_set_merge(struct sptlrpc_rule_set *set,
		struct sptlrpc_rule *rule);
		int sptlrpc_rule_set_choose(struct sptlrpc_rule_set *rset,
		enum lustre_sec_part from,
		enum lustre_sec_part to,

drivers/staging/lustre/lustre/ptlrpc/sec_config.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -285,7 +285,7 @@ static inline int rule_match_net(struct sptlrpc_rule *r1,
		* merge @rule into @rset.
		* the @rset slots might be expanded.
		*/
		int sptlrpc_rule_set_merge(struct sptlrpc_rule_set *rset,
		static int sptlrpc_rule_set_merge(struct sptlrpc_rule_set *rset,
		struct sptlrpc_rule *rule)
		{
		struct sptlrpc_rule *p = rset->srs_rules;
		@@ -370,8 +370,6 @@ int sptlrpc_rule_set_merge(struct sptlrpc_rule_set *rset,

		return 0;
		}
		EXPORT_SYMBOL(sptlrpc_rule_set_merge);

		/**
		* given from/to/nid, determine a matching flavor in ruleset.
		* return 1 if a match found, otherwise return 0.