[PATCH v2 12/17] cls_flower: Convert to idr_alloc_u32

[Matthew Wilcox]

From: Matthew Wilcox <mawil...@microsoft.com>

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

Signed-off-by: Matthew Wilcox <mawil...@microsoft.com>
---
 net/sched/cls_flower.c | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index ec0dc92f6104..adee3cf30bb3 100644
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -858,7 +858,6 @@ static int fl_change(struct net *net, struct sk_buff 
*in_skb,
        struct cls_fl_filter *fnew;
        struct nlattr **tb;
        struct fl_flow_mask mask = {};
-       unsigned long idr_index;
        int err;
 
        if (!tca[TCA_OPTIONS])
@@ -889,21 +888,17 @@ static int fl_change(struct net *net, struct sk_buff 
*in_skb,
                goto errout;
 
        if (!handle) {
-               err = idr_alloc_ext(&head->handle_idr, fnew, &idr_index,
-                                   1, 0x80000000, GFP_KERNEL);
-               if (err)
-                       goto errout;
-               fnew->handle = idr_index;
-       }
-
-       /* user specifies a handle and it doesn't exist */
-       if (handle && !fold) {
-               err = idr_alloc_ext(&head->handle_idr, fnew, &idr_index,
-                                   handle, handle + 1, GFP_KERNEL);
-               if (err)
-                       goto errout;
-               fnew->handle = idr_index;
+               handle = 1;
+               err = idr_alloc_u32(&head->handle_idr, fnew, &handle,
+                                   INT_MAX, GFP_KERNEL);
+       } else if (!fold) {
+               /* user specifies a handle and it doesn't exist */
+               err = idr_alloc_u32(&head->handle_idr, fnew, &handle,
+                                   handle, GFP_KERNEL);
        }
+       if (err)
+               goto errout;
+       fnew->handle = handle;
 
        if (tb[TCA_FLOWER_FLAGS]) {
                fnew->flags = nla_get_u32(tb[TCA_FLOWER_FLAGS]);
@@ -957,7 +952,6 @@ static int fl_change(struct net *net, struct sk_buff 
*in_skb,
        *arg = fnew;
 
        if (fold) {
-               fnew->handle = handle;
                idr_replace(&head->handle_idr, fnew, fnew->handle);
                list_replace_rcu(&fold->list, &fnew->list);
                tcf_unbind_filter(tp, &fold->res);
-- 
2.15.0