Skip to content

Commit

Permalink
net: netlink: make netlink_walk_start() void return type
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
TaeheeYoo authored and davem330 committed Jun 11, 2019
1 parent e28799e commit abf9979
Showing 1 changed file with 3 additions and 12 deletions.
15 changes: 3 additions & 12 deletions net/netlink/af_netlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)) {
Expand All @@ -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));

Expand All @@ -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);
Expand Down

0 comments on commit abf9979

Please sign in to comment.