aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/client.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2012-01-17 22:04:25 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-01-31 18:20:28 -0500
commitd2d7ce28a2f8ec6ca2a49145e643d2e3c7d21ba3 (patch)
tree4c73f071c2282185402a4da7d20b30749530c89f /fs/nfs/client.c
parent9157c31dd610a127bc6f01bc1953cf8b80382040 (diff)
NFSv4: Replace lock_owner->ld_id with an ida based allocator
Again, We're unlikely to ever need more than 2^31 simultaneous lock owners, so let's replace the custom allocator. Now that there are no more users, we can also get rid of the custom allocator code. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/client.c')
-rw-r--r--fs/nfs/client.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 8d1739d3424d..df60d9971b95 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -1093,6 +1093,7 @@ static struct nfs_server *nfs_alloc_server(void)
1093 } 1093 }
1094 1094
1095 ida_init(&server->openowner_id); 1095 ida_init(&server->openowner_id);
1096 ida_init(&server->lockowner_id);
1096 pnfs_init_server(server); 1097 pnfs_init_server(server);
1097 1098
1098 return server; 1099 return server;
@@ -1118,6 +1119,7 @@ void nfs_free_server(struct nfs_server *server)
1118 1119
1119 nfs_put_client(server->nfs_client); 1120 nfs_put_client(server->nfs_client);
1120 1121
1122 ida_destroy(&server->lockowner_id);
1121 ida_destroy(&server->openowner_id); 1123 ida_destroy(&server->openowner_id);
1122 nfs_free_iostats(server->io_stats); 1124 nfs_free_iostats(server->io_stats);
1123 bdi_destroy(&server->backing_dev_info); 1125 bdi_destroy(&server->backing_dev_info);