2013-03-05 20:03:08

by Tejun Heo

Subject: [PATCH 2/7] nfsd: convert to idr_alloc()

idr_get_new*() and friends are about to be deprecated. Convert to the
new idr_alloc() interface.

Only compile-tested.

Signed-off-by: Tejun Heo <[email protected]>
Cc: "J. Bruce Fields" <[email protected]>
Cc: [email protected]
---
fs/nfsd/nfs4state.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index d91d6db..2e27430 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -242,9 +242,8 @@ kmem_cache *slab)
if (!stid)
return NULL;

- if (!idr_pre_get(stateids, GFP_KERNEL))
- goto out_free;
- if (idr_get_new_above(stateids, stid, min_stateid, &new_id))
+ new_id = idr_alloc(stateids, stid, min_stateid, 0, GFP_KERNEL);
+ if (new_id < 0)
goto out_free;
stid->sc_client = cl;
stid->sc_type = 0;
--
1.8.1.4

2013-03-05 22:31:45

by J. Bruce Fields

Subject: Re: [PATCH 2/7] nfsd: convert to idr_alloc()

On Tue, Mar 05, 2013 at 12:02:47PM -0800, Tejun Heo wrote:
> idr_get_new*() and friends are about to be deprecated. Convert to the
> new idr_alloc() interface.
>
> Only compile-tested.

Runs fine too--thanks.

Acked-by: J. Bruce Fields <[email protected]>

--b.

>
> Signed-off-by: Tejun Heo <[email protected]>
> Cc: "J. Bruce Fields" <[email protected]>
> Cc: [email protected]
> ---
> fs/nfsd/nfs4state.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index d91d6db..2e27430 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -242,9 +242,8 @@ kmem_cache *slab)
> if (!stid)
> return NULL;
>
> - if (!idr_pre_get(stateids, GFP_KERNEL))
> - goto out_free;
> - if (idr_get_new_above(stateids, stid, min_stateid, &new_id))
> + new_id = idr_alloc(stateids, stid, min_stateid, 0, GFP_KERNEL);
> + if (new_id < 0)
> goto out_free;
> stid->sc_client = cl;
> stid->sc_type = 0;
> --
> 1.8.1.4
>