diff options
| author | Sunil Mushran <sunil.mushran@oracle.com> | 2009-02-26 15:00:47 -0800 |
|---|---|---|
| committer | Mark Fasheh <mfasheh@suse.com> | 2009-04-03 11:39:23 -0700 |
| commit | 7141514b8307734c117f100c4a3637887c5def45 (patch) | |
| tree | 8f2944508cdb0dd1ea7288d7300e4c29995c904e /fs/ocfs2/dlm/dlmcommon.h | |
| parent | e64ff14607ac90b2f3349550a41cc8dc0c0b1324 (diff) | |
| download | linux-7141514b8307734c117f100c4a3637887c5def45.tar.gz | |
ocfs2/dlm: Remove struct dlm_lock_name in struct dlm_master_list_entry
This patch removes struct dlm_lock_name and adds the entries directly
to struct dlm_master_list_entry. Under the new scheme, both mles that
are backed by a lockres or not, will have the name populated in mle->mname.
This allows us to get rid of code that was figuring out the location of
the mle name.
Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Diffstat (limited to 'fs/ocfs2/dlm/dlmcommon.h')
| -rw-r--r-- | fs/ocfs2/dlm/dlmcommon.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/fs/ocfs2/dlm/dlmcommon.h b/fs/ocfs2/dlm/dlmcommon.h index 266fde9354bd32..0102be35980c03 100644 --- a/fs/ocfs2/dlm/dlmcommon.h +++ b/fs/ocfs2/dlm/dlmcommon.h @@ -56,12 +56,6 @@ enum dlm_mle_type { DLM_MLE_NUM_TYPES }; -struct dlm_lock_name { - unsigned int hash; - unsigned int len; - unsigned char name[DLM_LOCKID_NAME_MAX]; -}; - struct dlm_master_list_entry { struct hlist_node master_hash_node; struct list_head hb_events; @@ -80,10 +74,10 @@ struct dlm_master_list_entry { enum dlm_mle_type type; struct o2hb_callback_func mle_hb_up; struct o2hb_callback_func mle_hb_down; - union { - struct dlm_lock_resource *mleres; - struct dlm_lock_name mlename; - } u; + struct dlm_lock_resource *mleres; + unsigned char mname[DLM_LOCKID_NAME_MAX]; + unsigned int mnamelen; + unsigned int mnamehash; }; enum dlm_ast_type { |