lkml.org 
[lkml]   [2023]   [Dec]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] ksmbd: Remove usage of the deprecated ida_simple_xx() API
    Date
    ida_alloc() and ida_free() should be preferred to the deprecated
    ida_simple_get() and ida_simple_remove().

    This is less verbose.

    Note that the upper limit of ida_simple_get() is exclusive, but the one of
    ida_alloc_range() is inclusive. So change a 0xFFFFFFFF into a 0xFFFFFFFE in
    order to keep the same behavior.

    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    ---
    fs/smb/server/mgmt/ksmbd_ida.c | 21 ++++++---------------
    1 file changed, 6 insertions(+), 15 deletions(-)

    diff --git a/fs/smb/server/mgmt/ksmbd_ida.c b/fs/smb/server/mgmt/ksmbd_ida.c
    index 54194d959a5e..a18e27e9e0cd 100644
    --- a/fs/smb/server/mgmt/ksmbd_ida.c
    +++ b/fs/smb/server/mgmt/ksmbd_ida.c
    @@ -5,42 +5,33 @@

    #include "ksmbd_ida.h"

    -static inline int __acquire_id(struct ida *ida, int from, int to)
    -{
    - return ida_simple_get(ida, from, to, GFP_KERNEL);
    -}
    -
    int ksmbd_acquire_smb2_tid(struct ida *ida)
    {
    - int id;
    -
    - id = __acquire_id(ida, 1, 0xFFFFFFFF);
    -
    - return id;
    + return ida_alloc_range(ida, 1, 0xFFFFFFFE, GFP_KERNEL);
    }

    int ksmbd_acquire_smb2_uid(struct ida *ida)
    {
    int id;

    - id = __acquire_id(ida, 1, 0);
    + id = ida_alloc_min(ida, 1, GFP_KERNEL);
    if (id == 0xFFFE)
    - id = __acquire_id(ida, 1, 0);
    + id = ida_alloc_min(ida, 1, GFP_KERNEL);

    return id;
    }

    int ksmbd_acquire_async_msg_id(struct ida *ida)
    {
    - return __acquire_id(ida, 1, 0);
    + return ida_alloc_min(ida, 1, GFP_KERNEL);
    }

    int ksmbd_acquire_id(struct ida *ida)
    {
    - return __acquire_id(ida, 0, 0);
    + return ida_alloc(ida, GFP_KERNEL);
    }

    void ksmbd_release_id(struct ida *ida, int id)
    {
    - ida_simple_remove(ida, id);
    + ida_free(ida, id);
    }
    --
    2.34.1

    \
     
     \ /
      Last update: 2023-12-14 21:59    [W:9.010 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site