[v2,10/17] cls_basic: Convert to use idr_alloc_u32

Message ID	20171129201922.24370-11-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 10/17] cls_basic: Convert to use idr_alloc_u32 Date: Wed, 29 Nov 2017 12:19:15 -0800 Message-Id: <20171129201922.24370-11-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-11-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 10/17] cls_basic: Convert to use idr_alloc_u32
Date: Wed, 29 Nov 2017 12:19:15 -0800
Message-Id: <20171129201922.24370-11-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 (Oracle) Nov. 29, 2017, 8:19 p.m. UTC

From: Matthew Wilcox <mawilcox@microsoft.com>

Use the new helper which saves a temporary variable and a few lines of
code.

Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
---
 net/sched/cls_basic.c | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/net/sched/cls_basic.c b/net/sched/cls_basic.c
index 147700afcf31..c4b242fee8e4 100644
--- a/net/sched/cls_basic.c
+++ b/net/sched/cls_basic.c
@@ -182,7 +182,6 @@  static int basic_change(struct net *net, struct sk_buff *in_skb,
 	struct nlattr *tb[TCA_BASIC_MAX + 1];
 	struct basic_filter *fold = (struct basic_filter *) *arg;
 	struct basic_filter *fnew;
-	unsigned long idr_index;
 
 	if (tca[TCA_OPTIONS] == NULL)
 		return -EINVAL;
@@ -205,21 +204,17 @@  static int basic_change(struct net *net, struct sk_buff *in_skb,
 	if (err < 0)
 		goto errout;
 
-	if (handle) {
-		fnew->handle = handle;
-		if (!fold) {
-			err = idr_alloc_ext(&head->handle_idr, fnew, &idr_index,
-					    handle, handle + 1, GFP_KERNEL);
-			if (err)
-				goto errout;
-		}
-	} else {
-		err = idr_alloc_ext(&head->handle_idr, fnew, &idr_index,
-				    1, 0x7FFFFFFF, GFP_KERNEL);
-		if (err)
-			goto errout;
-		fnew->handle = idr_index;
+	if (!handle) {
+		handle = 1;
+		err = idr_alloc_u32(&head->handle_idr, fnew, &handle,
+				    INT_MAX, GFP_KERNEL);
+	} else if (!fold) {
+		err = idr_alloc_u32(&head->handle_idr, fnew, &handle,
+				    handle, GFP_KERNEL);
 	}
+	if (err)
+		goto errout;
+	fnew->handle = handle;
 
 	err = basic_set_parms(net, tp, fnew, base, tb, tca[TCA_RATE], ovr);
 	if (err < 0) {

[v2,10/17] cls_basic: Convert to use idr_alloc_u32

Commit Message

Patch