summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2013-02-27 17:05:01 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-27 19:10:20 -0800
commitd6870312659d8c6e80419ddb09d366bdd0f17ab6 (patch)
tree12a5a607d1a9057b0e56f2e9f2c50391cc22075d /fs/nfs
parent94960e8c2e69d1e4c01c10c7b00bc0f7eba49fa1 (diff)
downloadblackbird-op-linux-d6870312659d8c6e80419ddb09d366bdd0f17ab6.tar.gz
blackbird-op-linux-d6870312659d8c6e80419ddb09d366bdd0f17ab6.zip
nfs4client: convert to idr_alloc()
Convert to the much saner new idr interface. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Trond Myklebust <Trond.Myklebust@netapp.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/nfs4client.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
index 2e9779b58b7a..47d100872390 100644
--- a/fs/nfs/nfs4client.c
+++ b/fs/nfs/nfs4client.c
@@ -29,15 +29,14 @@ static int nfs_get_cb_ident_idr(struct nfs_client *clp, int minorversion)
if (clp->rpc_ops->version != 4 || minorversion != 0)
return ret;
-retry:
- if (!idr_pre_get(&nn->cb_ident_idr, GFP_KERNEL))
- return -ENOMEM;
+ idr_preload(GFP_KERNEL);
spin_lock(&nn->nfs_client_lock);
- ret = idr_get_new(&nn->cb_ident_idr, clp, &clp->cl_cb_ident);
+ ret = idr_alloc(&nn->cb_ident_idr, clp, 0, 0, GFP_NOWAIT);
+ if (ret >= 0)
+ clp->cl_cb_ident = ret;
spin_unlock(&nn->nfs_client_lock);
- if (ret == -EAGAIN)
- goto retry;
- return ret;
+ idr_preload_end();
+ return ret < 0 ? ret : 0;
}
#ifdef CONFIG_NFS_V4_1
OpenPOWER on IntegriCloud