2023-12-10 17:32:32

by Christophe JAILLET

Subject: [PATCH] eventfd: 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.

Signed-off-by: Christophe JAILLET <[email protected]>
---
fs/eventfd.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/eventfd.c b/fs/eventfd.c
index 16bea05a7c78..ad8186d47ba7 100644
--- a/fs/eventfd.c
+++ b/fs/eventfd.c
@@ -82,7 +82,7 @@ EXPORT_SYMBOL_GPL(eventfd_signal_mask);
static void eventfd_free_ctx(struct eventfd_ctx *ctx)
{
if (ctx->id >= 0)
- ida_simple_remove(&eventfd_ida, ctx->id);
+ ida_free(&eventfd_ida, ctx->id);
kfree(ctx);
}

@@ -395,7 +395,7 @@ static int do_eventfd(unsigned int count, int flags)
init_waitqueue_head(&ctx->wqh);
ctx->count = count;
ctx->flags = flags;
- ctx->id = ida_simple_get(&eventfd_ida, 0, 0, GFP_KERNEL);
+ ctx->id = ida_alloc(&eventfd_ida, GFP_KERNEL);

flags &= EFD_SHARED_FCNTL_FLAGS;
flags |= O_RDWR;
--
2.34.1

2023-12-11 10:07:14

by Christian Brauner

Subject: Re: [PATCH] eventfd: Remove usage of the deprecated ida_simple_xx() API

On Sun, 10 Dec 2023 18:32:18 +0100, Christophe JAILLET wrote:
> ida_alloc() and ida_free() should be preferred to the deprecated
> ida_simple_get() and ida_simple_remove().
>
> This is less verbose.
>
>

Applied to the vfs.misc branch of the vfs/vfs.git tree.
Patches in the vfs.misc branch should appear in linux-next soon.

Please report any outstanding bugs that were missed during review in a
new review to the original patch series allowing us to drop it.

It's encouraged to provide Acked-bys and Reviewed-bys even though the
patch has now been applied. If possible patch trailers will be updated.

Note that commit hashes shown below are subject to change due to rebase,
trailer updates or similar. If in doubt, please check the listed branch.

tree: https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git
branch: vfs.misc

[1/1] eventfd: Remove usage of the deprecated ida_simple_xx() API
https://git.kernel.org/vfs/vfs/c/ece491e762cc

2023-12-11 12:30:57

by Jan Kara

Subject: Re: [PATCH] eventfd: Remove usage of the deprecated ida_simple_xx() API

On Sun 10-12-23 18:32:18, Christophe JAILLET wrote:
> ida_alloc() and ida_free() should be preferred to the deprecated
> ida_simple_get() and ida_simple_remove().
>
> This is less verbose.
>
> Signed-off-by: Christophe JAILLET <[email protected]>

Looks good. Feel free to add:

Reviewed-by: Jan Kara <[email protected]>

Honza

> ---
> fs/eventfd.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/eventfd.c b/fs/eventfd.c
> index 16bea05a7c78..ad8186d47ba7 100644
> --- a/fs/eventfd.c
> +++ b/fs/eventfd.c
> @@ -82,7 +82,7 @@ EXPORT_SYMBOL_GPL(eventfd_signal_mask);
> static void eventfd_free_ctx(struct eventfd_ctx *ctx)
> {
> if (ctx->id >= 0)
> - ida_simple_remove(&eventfd_ida, ctx->id);
> + ida_free(&eventfd_ida, ctx->id);
> kfree(ctx);
> }
>
> @@ -395,7 +395,7 @@ static int do_eventfd(unsigned int count, int flags)
> init_waitqueue_head(&ctx->wqh);
> ctx->count = count;
> ctx->flags = flags;
> - ctx->id = ida_simple_get(&eventfd_ida, 0, 0, GFP_KERNEL);
> + ctx->id = ida_alloc(&eventfd_ida, GFP_KERNEL);
>
> flags &= EFD_SHARED_FCNTL_FLAGS;
> flags |= O_RDWR;
> --
> 2.34.1
>
--
Jan Kara <[email protected]>
SUSE Labs, CR