diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-12-21 09:58:32 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-12-21 10:42:55 +1100 |
| commit | 11c51ca1135ad53dc84366758f9b04f5ecf041a5 (patch) | |
| tree | a3ed0ff0777a8ce62c1296009bd817c467ff8c77 /net/netfilter/nft_set_hash.c | |
| parent | b63c757d26dccc6a0f62ece8a6ccd6613c09b895 (diff) | |
| parent | 8f36e00065436412a02d1f50ad77375bdb506300 (diff) | |
Merge remote-tracking branch 'net-next/master'
Diffstat (limited to 'net/netfilter/nft_set_hash.c')
| -rw-r--r-- | net/netfilter/nft_set_hash.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/net/netfilter/nft_set_hash.c b/net/netfilter/nft_set_hash.c index f8166c1d5430..3f1624ee056f 100644 --- a/net/netfilter/nft_set_hash.c +++ b/net/netfilter/nft_set_hash.c @@ -251,11 +251,7 @@ static void nft_rhash_walk(const struct nft_ctx *ctx, struct nft_set *set, if (err) return; - err = rhashtable_walk_start(&hti); - if (err && err != -EAGAIN) { - iter->err = err; - goto out; - } + rhashtable_walk_start(&hti); while ((he = rhashtable_walk_next(&hti))) { if (IS_ERR(he)) { @@ -306,9 +302,7 @@ static void nft_rhash_gc(struct work_struct *work) if (err) goto schedule; - err = rhashtable_walk_start(&hti); - if (err && err != -EAGAIN) - goto out; + rhashtable_walk_start(&hti); while ((he = rhashtable_walk_next(&hti))) { if (IS_ERR(he)) { |