* [PATCH net-next] net: netlink: make netlink_walk_start() void return type
@ 2019-06-09 17:05 Taehee Yoo
2019-06-11 18:56 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Taehee Yoo @ 2019-06-09 17:05 UTC (permalink / raw)
To: davem, netdev; +Cc: Taehee Yoo
netlink_walk_start() needed to return an error code because of
rhashtable_walk_init(). but that was converted to rhashtable_walk_enter()
and it is a void type function. so now netlink_walk_start() doesn't need
any return value.
Signed-off-by: Taehee Yoo <ap420073@gmail.com>
---
net/netlink/af_netlink.c | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index e9ddfd782d16..7bc579f27332 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -2544,12 +2544,10 @@ struct nl_seq_iter {
int link;
};
-static int netlink_walk_start(struct nl_seq_iter *iter)
+static void netlink_walk_start(struct nl_seq_iter *iter)
{
rhashtable_walk_enter(&nl_table[iter->link].hash, &iter->hti);
rhashtable_walk_start(&iter->hti);
-
- return 0;
}
static void netlink_walk_stop(struct nl_seq_iter *iter)
@@ -2565,8 +2563,6 @@ static void *__netlink_seq_next(struct seq_file *seq)
do {
for (;;) {
- int err;
-
nlk = rhashtable_walk_next(&iter->hti);
if (IS_ERR(nlk)) {
@@ -2583,9 +2579,7 @@ static void *__netlink_seq_next(struct seq_file *seq)
if (++iter->link >= MAX_LINKS)
return NULL;
- err = netlink_walk_start(iter);
- if (err)
- return ERR_PTR(err);
+ netlink_walk_start(iter);
}
} while (sock_net(&nlk->sk) != seq_file_net(seq));
@@ -2597,13 +2591,10 @@ static void *netlink_seq_start(struct seq_file *seq, loff_t *posp)
struct nl_seq_iter *iter = seq->private;
void *obj = SEQ_START_TOKEN;
loff_t pos;
- int err;
iter->link = 0;
- err = netlink_walk_start(iter);
- if (err)
- return ERR_PTR(err);
+ netlink_walk_start(iter);
for (pos = *posp; pos && obj && !IS_ERR(obj); pos--)
obj = __netlink_seq_next(seq);
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] net: netlink: make netlink_walk_start() void return type
2019-06-09 17:05 [PATCH net-next] net: netlink: make netlink_walk_start() void return type Taehee Yoo
@ 2019-06-11 18:56 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2019-06-11 18:56 UTC (permalink / raw)
To: ap420073; +Cc: netdev
From: Taehee Yoo <ap420073@gmail.com>
Date: Mon, 10 Jun 2019 02:05:30 +0900
> netlink_walk_start() needed to return an error code because of
> rhashtable_walk_init(). but that was converted to rhashtable_walk_enter()
> and it is a void type function. so now netlink_walk_start() doesn't need
> any return value.
>
> Signed-off-by: Taehee Yoo <ap420073@gmail.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-06-11 18:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-09 17:05 [PATCH net-next] net: netlink: make netlink_walk_start() void return type Taehee Yoo
2019-06-11 18:56 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).