* [PATCH v2 1/6] Staging: lustre: ptlrpc: Declare sptlrpc_rule_set_merge as static
2015-10-02 8:15 [PATCH v2 0/6] Declare functions and structures as static Shraddha Barke
@ 2015-10-02 8:15 ` Shraddha Barke
2015-10-02 8:49 ` [Outreachy kernel] " Vaishali Thakkar
2015-10-02 8:15 ` [PATCH v2 2/6] Staging: lustre: ptlrpc: Declare sptlrpc_rule_set_free " Shraddha Barke
` (4 subsequent siblings)
5 siblings, 1 reply; 11+ messages in thread
From: Shraddha Barke @ 2015-10-02 8:15 UTC (permalink / raw)
To: outreachy-kernel
Declare sptlrpc_rule_set_merge as static since it is accessed from this
particular file only. Also remove its declaration from
header file
Changes in v2-
No change
Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com>
---
drivers/staging/lustre/lustre/include/lustre_sec.h | 2 --
drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 6 ++----
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/lustre/lustre/include/lustre_sec.h b/drivers/staging/lustre/lustre/include/lustre_sec.h
index 1d2c572..96a717e2 100644
--- a/drivers/staging/lustre/lustre/include/lustre_sec.h
+++ b/drivers/staging/lustre/lustre/include/lustre_sec.h
@@ -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,
diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec_config.c b/drivers/staging/lustre/lustre/ptlrpc/sec_config.c
index 0d29b87..6fb5b4c 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/sec_config.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/sec_config.c
@@ -285,8 +285,8 @@ 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,
- struct sptlrpc_rule *rule)
+static int sptlrpc_rule_set_merge(struct sptlrpc_rule_set *rset,
+ struct sptlrpc_rule *rule)
{
struct sptlrpc_rule *p = rset->srs_rules;
int spec_dir, spec_net;
@@ -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.
--
2.1.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [Outreachy kernel] [PATCH v2 1/6] Staging: lustre: ptlrpc: Declare sptlrpc_rule_set_merge as static
2015-10-02 8:15 ` [PATCH v2 1/6] Staging: lustre: ptlrpc: Declare sptlrpc_rule_set_merge " Shraddha Barke
@ 2015-10-02 8:49 ` Vaishali Thakkar
2015-10-02 8:55 ` Shraddha Barke
0 siblings, 1 reply; 11+ messages in thread
From: Vaishali Thakkar @ 2015-10-02 8:49 UTC (permalink / raw)
To: Shraddha Barke; +Cc: outreachy-kernel
On Fri, Oct 2, 2015 at 1:45 PM, Shraddha Barke <shraddha.6596@gmail.com> wrote:
> Declare sptlrpc_rule_set_merge as static since it is accessed from this
> particular file only. Also remove its declaration from
> header file
>
> Changes in v2-
> No change
Hi,
You need to write 'Changes in v2' part under --- . So that when the patch will
be applied, part under --- will go away.
> Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com>
> ---
> drivers/staging/lustre/lustre/include/lustre_sec.h | 2 --
> drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 6 ++----
> 2 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/staging/lustre/lustre/include/lustre_sec.h b/drivers/staging/lustre/lustre/include/lustre_sec.h
> index 1d2c572..96a717e2 100644
> --- a/drivers/staging/lustre/lustre/include/lustre_sec.h
> +++ b/drivers/staging/lustre/lustre/include/lustre_sec.h
> @@ -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,
> diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec_config.c b/drivers/staging/lustre/lustre/ptlrpc/sec_config.c
> index 0d29b87..6fb5b4c 100644
> --- a/drivers/staging/lustre/lustre/ptlrpc/sec_config.c
> +++ b/drivers/staging/lustre/lustre/ptlrpc/sec_config.c
> @@ -285,8 +285,8 @@ 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,
> - struct sptlrpc_rule *rule)
> +static int sptlrpc_rule_set_merge(struct sptlrpc_rule_set *rset,
> + struct sptlrpc_rule *rule)
> {
> struct sptlrpc_rule *p = rset->srs_rules;
> int spec_dir, spec_net;
> @@ -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.
> --
> 2.1.4
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> To post to this group, send email to outreachy-kernel@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/1443773747-2985-2-git-send-email-shraddha.6596%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
--
Vaishali
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [Outreachy kernel] [PATCH v2 1/6] Staging: lustre: ptlrpc: Declare sptlrpc_rule_set_merge as static
2015-10-02 8:49 ` [Outreachy kernel] " Vaishali Thakkar
@ 2015-10-02 8:55 ` Shraddha Barke
2015-10-02 9:00 ` Vaishali Thakkar
2015-10-02 9:20 ` Greg KH
0 siblings, 2 replies; 11+ messages in thread
From: Shraddha Barke @ 2015-10-02 8:55 UTC (permalink / raw)
To: Vaishali Thakkar; +Cc: Shraddha Barke, outreachy-kernel
On Fri, 2 Oct 2015, Vaishali Thakkar wrote:
> On Fri, Oct 2, 2015 at 1:45 PM, Shraddha Barke <shraddha.6596@gmail.com> wrote:
>> Declare sptlrpc_rule_set_merge as static since it is accessed from this
>> particular file only. Also remove its declaration from
>> header file
>>
>> Changes in v2-
>> No change
>
> Hi,
>
> You need to write 'Changes in v2' part under --- . So that when the patch will
> be applied, part under --- will go away.
Shoot. Will I have to send v3 ? Or just that one patch again?
>
>> Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com>
>> ---
>> drivers/staging/lustre/lustre/include/lustre_sec.h | 2 --
>> drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 6 ++----
>> 2 files changed, 2 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/staging/lustre/lustre/include/lustre_sec.h b/drivers/staging/lustre/lustre/include/lustre_sec.h
>> index 1d2c572..96a717e2 100644
>> --- a/drivers/staging/lustre/lustre/include/lustre_sec.h
>> +++ b/drivers/staging/lustre/lustre/include/lustre_sec.h
>> @@ -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,
>> diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec_config.c b/drivers/staging/lustre/lustre/ptlrpc/sec_config.c
>> index 0d29b87..6fb5b4c 100644
>> --- a/drivers/staging/lustre/lustre/ptlrpc/sec_config.c
>> +++ b/drivers/staging/lustre/lustre/ptlrpc/sec_config.c
>> @@ -285,8 +285,8 @@ 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,
>> - struct sptlrpc_rule *rule)
>> +static int sptlrpc_rule_set_merge(struct sptlrpc_rule_set *rset,
>> + struct sptlrpc_rule *rule)
>> {
>> struct sptlrpc_rule *p = rset->srs_rules;
>> int spec_dir, spec_net;
>> @@ -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.
>> --
>> 2.1.4
>>
>> --
>> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
>> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
>> To post to this group, send email to outreachy-kernel@googlegroups.com.
>> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/1443773747-2985-2-git-send-email-shraddha.6596%40gmail.com.
>> For more options, visit https://groups.google.com/d/optout.
>
>
>
> --
> Vaishali
>
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [Outreachy kernel] [PATCH v2 1/6] Staging: lustre: ptlrpc: Declare sptlrpc_rule_set_merge as static
2015-10-02 8:55 ` Shraddha Barke
@ 2015-10-02 9:00 ` Vaishali Thakkar
2015-10-02 9:20 ` Greg KH
1 sibling, 0 replies; 11+ messages in thread
From: Vaishali Thakkar @ 2015-10-02 9:00 UTC (permalink / raw)
To: Shraddha Barke; +Cc: outreachy-kernel
On Fri, Oct 2, 2015 at 2:25 PM, Shraddha Barke <shraddha.6596@gmail.com> wrote:
>
>
> On Fri, 2 Oct 2015, Vaishali Thakkar wrote:
>
>> On Fri, Oct 2, 2015 at 1:45 PM, Shraddha Barke <shraddha.6596@gmail.com>
>> wrote:
>>>
>>> Declare sptlrpc_rule_set_merge as static since it is accessed from this
>>> particular file only. Also remove its declaration from
>>> header file
>>>
>>> Changes in v2-
>>> No change
>>
>>
>> Hi,
>>
>> You need to write 'Changes in v2' part under --- . So that when the patch
>> will
>> be applied, part under --- will go away.
>
>
> Shoot. Will I have to send v3 ? Or just that one patch again?
If Greg has not yet applied any of the patches from this series, then
it is better to send v3 of whole series so that it will be easy for him
to pick all these patches at a time without any confusion.
>>
>>> Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com>
>>> ---
>>> drivers/staging/lustre/lustre/include/lustre_sec.h | 2 --
>>> drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 6 ++----
>>> 2 files changed, 2 insertions(+), 6 deletions(-)
>>>
>>> diff --git a/drivers/staging/lustre/lustre/include/lustre_sec.h
>>> b/drivers/staging/lustre/lustre/include/lustre_sec.h
>>> index 1d2c572..96a717e2 100644
>>> --- a/drivers/staging/lustre/lustre/include/lustre_sec.h
>>> +++ b/drivers/staging/lustre/lustre/include/lustre_sec.h
>>> @@ -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,
>>> diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec_config.c
>>> b/drivers/staging/lustre/lustre/ptlrpc/sec_config.c
>>> index 0d29b87..6fb5b4c 100644
>>> --- a/drivers/staging/lustre/lustre/ptlrpc/sec_config.c
>>> +++ b/drivers/staging/lustre/lustre/ptlrpc/sec_config.c
>>> @@ -285,8 +285,8 @@ 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,
>>> - struct sptlrpc_rule *rule)
>>> +static int sptlrpc_rule_set_merge(struct sptlrpc_rule_set *rset,
>>> + struct sptlrpc_rule *rule)
>>> {
>>> struct sptlrpc_rule *p = rset->srs_rules;
>>> int spec_dir, spec_net;
>>> @@ -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.
>>> --
>>> 2.1.4
>>>
>>> --
>>> You received this message because you are subscribed to the Google Groups
>>> "outreachy-kernel" group.
>>> To unsubscribe from this group and stop receiving emails from it, send an
>>> email to outreachy-kernel+unsubscribe@googlegroups.com.
>>> To post to this group, send email to outreachy-kernel@googlegroups.com.
>>> To view this discussion on the web visit
>>> https://groups.google.com/d/msgid/outreachy-kernel/1443773747-2985-2-git-send-email-shraddha.6596%40gmail.com.
>>> For more options, visit https://groups.google.com/d/optout.
>>
>>
>>
>>
>> --
>> Vaishali
>>
>
--
Vaishali
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [Outreachy kernel] [PATCH v2 1/6] Staging: lustre: ptlrpc: Declare sptlrpc_rule_set_merge as static
2015-10-02 8:55 ` Shraddha Barke
2015-10-02 9:00 ` Vaishali Thakkar
@ 2015-10-02 9:20 ` Greg KH
1 sibling, 0 replies; 11+ messages in thread
From: Greg KH @ 2015-10-02 9:20 UTC (permalink / raw)
To: Shraddha Barke; +Cc: Vaishali Thakkar, outreachy-kernel
On Fri, Oct 02, 2015 at 02:25:55PM +0530, Shraddha Barke wrote:
>
>
> On Fri, 2 Oct 2015, Vaishali Thakkar wrote:
>
> >On Fri, Oct 2, 2015 at 1:45 PM, Shraddha Barke <shraddha.6596@gmail.com> wrote:
> >>Declare sptlrpc_rule_set_merge as static since it is accessed from this
> >>particular file only. Also remove its declaration from
> >>header file
> >>
> >>Changes in v2-
> >> No change
> >
> >Hi,
> >
> >You need to write 'Changes in v2' part under --- . So that when the patch will
> >be applied, part under --- will go away.
>
> Shoot. Will I have to send v3 ? Or just that one patch again?
Please send a whole new series, that's much easier for me to handle than
individual patch versions.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v2 2/6] Staging: lustre: ptlrpc: Declare sptlrpc_rule_set_free as static
2015-10-02 8:15 [PATCH v2 0/6] Declare functions and structures as static Shraddha Barke
2015-10-02 8:15 ` [PATCH v2 1/6] Staging: lustre: ptlrpc: Declare sptlrpc_rule_set_merge " Shraddha Barke
@ 2015-10-02 8:15 ` Shraddha Barke
2015-10-02 8:15 ` [PATCH v2 3/6] Staging: lustre: ptlrpc: Declare sptlrpc_rule_set_expand " Shraddha Barke
` (3 subsequent siblings)
5 siblings, 0 replies; 11+ messages in thread
From: Shraddha Barke @ 2015-10-02 8:15 UTC (permalink / raw)
To: outreachy-kernel
Declare sptlrpc_rule_set_free 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>
---
Changes in v2-
No change
drivers/staging/lustre/lustre/include/lustre_sec.h | 1 -
drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/staging/lustre/lustre/include/lustre_sec.h b/drivers/staging/lustre/lustre/include/lustre_sec.h
index 96a717e2..d284f91 100644
--- a/drivers/staging/lustre/lustre/include/lustre_sec.h
+++ b/drivers/staging/lustre/lustre/include/lustre_sec.h
@@ -329,7 +329,6 @@ static inline void sptlrpc_rule_set_init(struct sptlrpc_rule_set *set)
memset(set, 0, sizeof(*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_choose(struct sptlrpc_rule_set *rset,
enum lustre_sec_part from,
diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec_config.c b/drivers/staging/lustre/lustre/ptlrpc/sec_config.c
index 6fb5b4c..0309817 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/sec_config.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/sec_config.c
@@ -215,7 +215,7 @@ int sptlrpc_parse_rule(char *param, struct sptlrpc_rule *rule)
}
EXPORT_SYMBOL(sptlrpc_parse_rule);
-void sptlrpc_rule_set_free(struct sptlrpc_rule_set *rset)
+static void sptlrpc_rule_set_free(struct sptlrpc_rule_set *rset)
{
LASSERT(rset->srs_nslot ||
(rset->srs_nrule == 0 && rset->srs_rules == NULL));
@@ -225,7 +225,6 @@ void sptlrpc_rule_set_free(struct sptlrpc_rule_set *rset)
sptlrpc_rule_set_init(rset);
}
}
-EXPORT_SYMBOL(sptlrpc_rule_set_free);
/*
* return 0 if the rule set could accommodate one more rule.
--
2.1.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v2 3/6] Staging: lustre: ptlrpc: Declare sptlrpc_rule_set_expand as static
2015-10-02 8:15 [PATCH v2 0/6] Declare functions and structures as static Shraddha Barke
2015-10-02 8:15 ` [PATCH v2 1/6] Staging: lustre: ptlrpc: Declare sptlrpc_rule_set_merge " Shraddha Barke
2015-10-02 8:15 ` [PATCH v2 2/6] Staging: lustre: ptlrpc: Declare sptlrpc_rule_set_free " Shraddha Barke
@ 2015-10-02 8:15 ` Shraddha Barke
2015-10-02 8:15 ` [PATCH v2 4/6] Staging: lustre: ptlrpc: Declare sptlrpc_rule_set_choose " Shraddha Barke
` (2 subsequent siblings)
5 siblings, 0 replies; 11+ messages in thread
From: Shraddha Barke @ 2015-10-02 8:15 UTC (permalink / raw)
To: outreachy-kernel
Declare sptlrpc_rule_set_expand 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>
---
Changes in v2-
No change.
drivers/staging/lustre/lustre/include/lustre_sec.h | 1 -
drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/staging/lustre/lustre/include/lustre_sec.h b/drivers/staging/lustre/lustre/include/lustre_sec.h
index d284f91..4f1d983 100644
--- a/drivers/staging/lustre/lustre/include/lustre_sec.h
+++ b/drivers/staging/lustre/lustre/include/lustre_sec.h
@@ -329,7 +329,6 @@ static inline void sptlrpc_rule_set_init(struct sptlrpc_rule_set *set)
memset(set, 0, sizeof(*set));
}
-int sptlrpc_rule_set_expand(struct sptlrpc_rule_set *set);
int sptlrpc_rule_set_choose(struct sptlrpc_rule_set *rset,
enum lustre_sec_part from,
enum lustre_sec_part to,
diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec_config.c b/drivers/staging/lustre/lustre/ptlrpc/sec_config.c
index 0309817..0664042 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/sec_config.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/sec_config.c
@@ -229,7 +229,7 @@ static void sptlrpc_rule_set_free(struct sptlrpc_rule_set *rset)
/*
* return 0 if the rule set could accommodate one more rule.
*/
-int sptlrpc_rule_set_expand(struct sptlrpc_rule_set *rset)
+static int sptlrpc_rule_set_expand(struct sptlrpc_rule_set *rset)
{
struct sptlrpc_rule *rules;
int nslot;
--
2.1.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v2 4/6] Staging: lustre: ptlrpc: Declare sptlrpc_rule_set_choose as static
2015-10-02 8:15 [PATCH v2 0/6] Declare functions and structures as static Shraddha Barke
` (2 preceding siblings ...)
2015-10-02 8:15 ` [PATCH v2 3/6] Staging: lustre: ptlrpc: Declare sptlrpc_rule_set_expand " Shraddha Barke
@ 2015-10-02 8:15 ` Shraddha Barke
2015-10-02 8:15 ` [PATCH v2 5/6] Staging: lustre: ptlrpc: Declare sptlrpc_req_replace_dead_ctx " Shraddha Barke
2015-10-02 8:15 ` [PATCH v2 6/6] Staging: lustre: ptlrpc: Declare sptlrpc_parse_rule " Shraddha Barke
5 siblings, 0 replies; 11+ messages in thread
From: Shraddha Barke @ 2015-10-02 8:15 UTC (permalink / raw)
To: outreachy-kernel
Declare sptlrpc_rule_set_choose 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>
---
Changes in v2-
No change.
drivers/staging/lustre/lustre/include/lustre_sec.h | 6 ------
drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 11 +++++------
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/lustre/lustre/include/lustre_sec.h b/drivers/staging/lustre/lustre/include/lustre_sec.h
index 4f1d983..50560a8 100644
--- a/drivers/staging/lustre/lustre/include/lustre_sec.h
+++ b/drivers/staging/lustre/lustre/include/lustre_sec.h
@@ -329,12 +329,6 @@ static inline void sptlrpc_rule_set_init(struct sptlrpc_rule_set *set)
memset(set, 0, sizeof(*set));
}
-int sptlrpc_rule_set_choose(struct sptlrpc_rule_set *rset,
- enum lustre_sec_part from,
- enum lustre_sec_part to,
- lnet_nid_t nid,
- struct sptlrpc_flavor *sf);
-
int sptlrpc_process_config(struct lustre_cfg *lcfg);
void sptlrpc_conf_log_start(const char *logname);
void sptlrpc_conf_log_stop(const char *logname);
diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec_config.c b/drivers/staging/lustre/lustre/ptlrpc/sec_config.c
index 0664042..7e698f3 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/sec_config.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/sec_config.c
@@ -373,11 +373,11 @@ static int sptlrpc_rule_set_merge(struct sptlrpc_rule_set *rset,
* given from/to/nid, determine a matching flavor in ruleset.
* return 1 if a match found, otherwise return 0.
*/
-int sptlrpc_rule_set_choose(struct sptlrpc_rule_set *rset,
- enum lustre_sec_part from,
- enum lustre_sec_part to,
- lnet_nid_t nid,
- struct sptlrpc_flavor *sf)
+static int sptlrpc_rule_set_choose(struct sptlrpc_rule_set *rset,
+ enum lustre_sec_part from,
+ enum lustre_sec_part to,
+ lnet_nid_t nid,
+ struct sptlrpc_flavor *sf)
{
struct sptlrpc_rule *r;
int n;
@@ -404,7 +404,6 @@ int sptlrpc_rule_set_choose(struct sptlrpc_rule_set *rset,
return 0;
}
-EXPORT_SYMBOL(sptlrpc_rule_set_choose);
/**********************************
* sptlrpc configuration support *
--
2.1.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v2 5/6] Staging: lustre: ptlrpc: Declare sptlrpc_req_replace_dead_ctx as static
2015-10-02 8:15 [PATCH v2 0/6] Declare functions and structures as static Shraddha Barke
` (3 preceding siblings ...)
2015-10-02 8:15 ` [PATCH v2 4/6] Staging: lustre: ptlrpc: Declare sptlrpc_rule_set_choose " Shraddha Barke
@ 2015-10-02 8:15 ` Shraddha Barke
2015-10-02 8:15 ` [PATCH v2 6/6] Staging: lustre: ptlrpc: Declare sptlrpc_parse_rule " Shraddha Barke
5 siblings, 0 replies; 11+ messages in thread
From: Shraddha Barke @ 2015-10-02 8:15 UTC (permalink / raw)
To: outreachy-kernel
Declare sptlrpc_req_replace_dead_ctx as static since it is accessed from
this particular file only. Also remove it's declaration from
header file
Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com>
---
Changes in v2-
No change
drivers/staging/lustre/lustre/include/lustre_sec.h | 1 -
drivers/staging/lustre/lustre/ptlrpc/sec.c | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/staging/lustre/lustre/include/lustre_sec.h b/drivers/staging/lustre/lustre/include/lustre_sec.h
index 50560a8..ab963b9 100644
--- a/drivers/staging/lustre/lustre/include/lustre_sec.h
+++ b/drivers/staging/lustre/lustre/include/lustre_sec.h
@@ -1026,7 +1026,6 @@ void sptlrpc_import_flush_all_ctx(struct obd_import *imp);
int sptlrpc_req_get_ctx(struct ptlrpc_request *req);
void sptlrpc_req_put_ctx(struct ptlrpc_request *req, int sync);
int sptlrpc_req_refresh_ctx(struct ptlrpc_request *req, long timeout);
-int sptlrpc_req_replace_dead_ctx(struct ptlrpc_request *req);
void sptlrpc_req_set_flavor(struct ptlrpc_request *req, int opcode);
int sptlrpc_parse_rule(char *param, struct sptlrpc_rule *rule);
diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec.c b/drivers/staging/lustre/lustre/ptlrpc/sec.c
index 67604b5..84e9881 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/sec.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/sec.c
@@ -470,7 +470,7 @@ int sptlrpc_req_ctx_switch(struct ptlrpc_request *req,
* \note a request must have a context, to keep other parts of code happy.
* In any case of failure during the switching, we must restore the old one.
*/
-int sptlrpc_req_replace_dead_ctx(struct ptlrpc_request *req)
+static int sptlrpc_req_replace_dead_ctx(struct ptlrpc_request *req)
{
struct ptlrpc_cli_ctx *oldctx = req->rq_cli_ctx;
struct ptlrpc_cli_ctx *newctx;
@@ -523,7 +523,6 @@ int sptlrpc_req_replace_dead_ctx(struct ptlrpc_request *req)
sptlrpc_cli_ctx_put(oldctx, 1);
return 0;
}
-EXPORT_SYMBOL(sptlrpc_req_replace_dead_ctx);
static
int ctx_check_refresh(struct ptlrpc_cli_ctx *ctx)
--
2.1.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH v2 6/6] Staging: lustre: ptlrpc: Declare sptlrpc_parse_rule as static
2015-10-02 8:15 [PATCH v2 0/6] Declare functions and structures as static Shraddha Barke
` (4 preceding siblings ...)
2015-10-02 8:15 ` [PATCH v2 5/6] Staging: lustre: ptlrpc: Declare sptlrpc_req_replace_dead_ctx " Shraddha Barke
@ 2015-10-02 8:15 ` Shraddha Barke
5 siblings, 0 replies; 11+ messages in thread
From: Shraddha Barke @ 2015-10-02 8:15 UTC (permalink / raw)
To: outreachy-kernel
Declare sptlrpc_parse_rule as static since it is accessed from this
particular file only. Also remove it's declaration from
header file
Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com>
---
Changes in v2-
No change.
drivers/staging/lustre/lustre/include/lustre_sec.h | 1 -
drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/staging/lustre/lustre/include/lustre_sec.h b/drivers/staging/lustre/lustre/include/lustre_sec.h
index ab963b9..fc1f573 100644
--- a/drivers/staging/lustre/lustre/include/lustre_sec.h
+++ b/drivers/staging/lustre/lustre/include/lustre_sec.h
@@ -1028,7 +1028,6 @@ void sptlrpc_req_put_ctx(struct ptlrpc_request *req, int sync);
int sptlrpc_req_refresh_ctx(struct ptlrpc_request *req, long timeout);
void sptlrpc_req_set_flavor(struct ptlrpc_request *req, int opcode);
-int sptlrpc_parse_rule(char *param, struct sptlrpc_rule *rule);
/* gc */
void sptlrpc_gc_add_sec(struct ptlrpc_sec *sec);
diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec_config.c b/drivers/staging/lustre/lustre/ptlrpc/sec_config.c
index 7e698f3..c96a5c7 100644
--- a/drivers/staging/lustre/lustre/ptlrpc/sec_config.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/sec_config.c
@@ -159,7 +159,7 @@ static void sptlrpc_rule_init(struct sptlrpc_rule *rule)
/*
* format: network[.direction]=flavor
*/
-int sptlrpc_parse_rule(char *param, struct sptlrpc_rule *rule)
+static int sptlrpc_parse_rule(char *param, struct sptlrpc_rule *rule)
{
char *flavor, *dir;
int rc;
@@ -213,7 +213,6 @@ int sptlrpc_parse_rule(char *param, struct sptlrpc_rule *rule)
return 0;
}
-EXPORT_SYMBOL(sptlrpc_parse_rule);
static void sptlrpc_rule_set_free(struct sptlrpc_rule_set *rset)
{
--
2.1.4
^ permalink raw reply related [flat|nested] 11+ messages in thread