Commit ebfee7ad authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Steve French

ksmbd: Remove usage of the deprecated ida_simple_xx() API

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: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent b6e9a44e
...@@ -5,42 +5,33 @@ ...@@ -5,42 +5,33 @@
#include "ksmbd_ida.h" #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 ksmbd_acquire_smb2_tid(struct ida *ida)
{ {
int id; return ida_alloc_range(ida, 1, 0xFFFFFFFE, GFP_KERNEL);
id = __acquire_id(ida, 1, 0xFFFFFFFF);
return id;
} }
int ksmbd_acquire_smb2_uid(struct ida *ida) int ksmbd_acquire_smb2_uid(struct ida *ida)
{ {
int id; int id;
id = __acquire_id(ida, 1, 0); id = ida_alloc_min(ida, 1, GFP_KERNEL);
if (id == 0xFFFE) if (id == 0xFFFE)
id = __acquire_id(ida, 1, 0); id = ida_alloc_min(ida, 1, GFP_KERNEL);
return id; return id;
} }
int ksmbd_acquire_async_msg_id(struct ida *ida) 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) 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) void ksmbd_release_id(struct ida *ida, int id)
{ {
ida_simple_remove(ida, id); ida_free(ida, id);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment