diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-01-17 22:04:25 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-01-31 18:20:28 -0500 |
commit | d2d7ce28a2f8ec6ca2a49145e643d2e3c7d21ba3 (patch) | |
tree | 4c73f071c2282185402a4da7d20b30749530c89f /include/linux/nfs_fs_sb.h | |
parent | 9157c31dd610a127bc6f01bc1953cf8b80382040 (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 'include/linux/nfs_fs_sb.h')
-rw-r--r-- | include/linux/nfs_fs_sb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h index 645537e18bd0..c23469308b8e 100644 --- a/include/linux/nfs_fs_sb.h +++ b/include/linux/nfs_fs_sb.h | |||
@@ -152,9 +152,9 @@ struct nfs_server { | |||
152 | 152 | ||
153 | /* the following fields are protected by nfs_client->cl_lock */ | 153 | /* the following fields are protected by nfs_client->cl_lock */ |
154 | struct rb_root state_owners; | 154 | struct rb_root state_owners; |
155 | struct rb_root lockowner_id; | ||
156 | #endif | 155 | #endif |
157 | struct ida openowner_id; | 156 | struct ida openowner_id; |
157 | struct ida lockowner_id; | ||
158 | struct list_head state_owners_lru; | 158 | struct list_head state_owners_lru; |
159 | struct list_head layouts; | 159 | struct list_head layouts; |
160 | struct list_head delegations; | 160 | struct list_head delegations; |