diff options
| author | David Teigland <teigland@redhat.com> | 2011-07-07 14:05:03 -0500 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2011-07-12 16:02:09 -0500 |
| commit | 3881ac04ebf94268ba3d6e486aa524fd41f893a9 (patch) | |
| tree | 2ddb5c099f60f541d7e50f669f84fd58c3920bec /fs/dlm/dlm_internal.h | |
| parent | 3d6aa675fff9eee5a6339d67b355b63a6d69565f (diff) | |
| download | linux-3881ac04ebf94268ba3d6e486aa524fd41f893a9.tar.gz | |
dlm: improve rsb searches
By pre-allocating rsb structs before searching the hash table, they can be inserted immediately. This avoids always having to repeat the search when adding the struct to hash list. This also adds space to the rsb struct for a max resource name, so an rsb allocation can be used by any request. The constant size also allows us to finally use a slab for the rsb structs. Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs/dlm/dlm_internal.h')
| -rw-r--r-- | fs/dlm/dlm_internal.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h index 23a234bddc60..6614f335e25d 100644 --- a/fs/dlm/dlm_internal.h +++ b/fs/dlm/dlm_internal.h @@ -293,7 +293,7 @@ struct dlm_rsb { int res_recover_locks_count; char *res_lvbptr; - char res_name[1]; + char res_name[DLM_RESNAME_MAXLEN+1]; }; /* find_rsb() flags */ @@ -477,6 +477,10 @@ struct dlm_ls { struct mutex ls_timeout_mutex; struct list_head ls_timeout; + spinlock_t ls_new_rsb_spin; + int ls_new_rsb_count; + struct list_head ls_new_rsb; /* new rsb structs */ + struct list_head ls_nodes; /* current nodes in ls */ struct list_head ls_nodes_gone; /* dead node list, recovery */ int ls_num_nodes; /* number of nodes in ls */ |