[v2,14/17] cls_u32: Convert to idr_alloc_u32

Message ID	20171129201922.24370-15-willy@infradead.org
State	Not Applicable, archived
Delegated to:	David Miller
Headers	show Return-Path: <netdev-owner@vger.kernel.org> From: Matthew Wilcox <willy@infradead.org> To: willy@infradead.org, netdev@vger.kernel.org Cc: Matthew Wilcox <mawilcox@microsoft.com> Subject: [PATCH v2 14/17] cls_u32: Convert to idr_alloc_u32 Date: Wed, 29 Nov 2017 12:19:19 -0800 Message-Id: <20171129201922.24370-15-willy@infradead.org> In-Reply-To: <20171129201922.24370-1-willy@infradead.org> References: <20171129201922.24370-1-willy@infradead.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk
Series	IDR changes for v4.15-rc1 \| expand [v2,00/17] IDR changes for v4.15-rc1 [v2,01/17] idr: Fix build [v2,02/17] radix tree test suite: Remove ARRAY_SIZE [v2,03/17] idr test suite: Fix ida_test_random() [v2,04/17] IDR test suite: Check handling negative end correctly [v2,05/17] idr: Delete idr_remove_ext function [v2,06/17] idr: Delete idr_replace_ext function [v2,07/17] idr: Delete idr_find_ext function [v2,08/17] idr: Add idr_alloc_u32 helper [v2,09/17] net sched actions: Convert to use idr_alloc_u32 [v2,10/17] cls_basic: Convert to use idr_alloc_u32 [v2,11/17] cls_bpf: Convert to use idr_alloc_u32 [v2,12/17] cls_flower: Convert to idr_alloc_u32 [v2,13/17] cls_u32: Reinstate cyclic allocation [v2,14/17] cls_u32: Convert to idr_alloc_u32 [v2,15/17] idr: Rename idr_alloc_ext to idr_alloc_ul [v2,16/17] idr: Rename idr_for_each_entry_ext [v2,17/17] idr: Warn if old iterators see large IDs

Message ID

20171129201922.24370-15-willy@infradead.org

State

Not Applicable, archived

Delegated to:

David Miller

Headers

From: Matthew Wilcox <willy@infradead.org>
To: willy@infradead.org, netdev@vger.kernel.org
Cc: Matthew Wilcox <mawilcox@microsoft.com>
Subject: [PATCH v2 14/17] cls_u32: Convert to idr_alloc_u32
Date: Wed, 29 Nov 2017 12:19:19 -0800
Message-Id: <20171129201922.24370-15-willy@infradead.org>
In-Reply-To: <20171129201922.24370-1-willy@infradead.org>
References: <20171129201922.24370-1-willy@infradead.org>
Sender: netdev-owner@vger.kernel.org
Precedence: bulk

Series

IDR changes for v4.15-rc1 | expand

Commit Message

Matthew Wilcox Nov. 29, 2017, 8:19 p.m. UTC

From: Matthew Wilcox <mawilcox@microsoft.com>

No real benefit to this classifier, but since we're allocating a u32
anyway, we should use this function.

Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
---
 net/sched/cls_u32.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c
index e65b47483dc0..e433d1adccc8 100644
--- a/net/sched/cls_u32.c
+++ b/net/sched/cls_u32.c
@@ -970,8 +970,8 @@  static int u32_change(struct net *net, struct sk_buff *in_skb,
 				return -ENOMEM;
 			}
 		} else {
-			err = idr_alloc_ext(&tp_c->handle_idr, ht, NULL,
-					    handle, handle + 1, GFP_KERNEL);
+			err = idr_alloc_u32(&tp_c->handle_idr, ht, &handle,
+					    handle, GFP_KERNEL);
 			if (err) {
 				kfree(ht);
 				return err;
@@ -1020,8 +1020,7 @@  static int u32_change(struct net *net, struct sk_buff *in_skb,
 		if (TC_U32_HTID(handle) && TC_U32_HTID(handle^htid))
 			return -EINVAL;
 		handle = htid | TC_U32_NODE(handle);
-		err = idr_alloc_ext(&ht->handle_idr, NULL, NULL,
-				    handle, handle + 1,
+		err = idr_alloc_u32(&ht->handle_idr, NULL, &handle, handle,
 				    GFP_KERNEL);
 		if (err)
 			return err;

[v2,14/17] cls_u32: Convert to idr_alloc_u32

Commit Message

Patch