diff options
| author | Joel Becker <joel.becker@oracle.com> | 2008-02-01 12:16:57 -0800 |
|---|---|---|
| committer | Mark Fasheh <mfasheh@suse.com> | 2008-04-18 08:56:04 -0700 |
| commit | 8f2c9c1b16bf6ed0903b29c49d56fa0109a390e4 (patch) | |
| tree | 8564370d96cbfb3a0125f17c93ee3587efef1ed1 /fs/ocfs2/ocfs2.h | |
| parent | 7431cd7e8dd0e46e9b12bd6a1ac1286f4b420371 (diff) | |
| download | lwn-8f2c9c1b16bf6ed0903b29c49d56fa0109a390e4.tar.gz lwn-8f2c9c1b16bf6ed0903b29c49d56fa0109a390e4.zip | |
ocfs2: Create the lock status block union.
Wrap the lock status block (lksb) in a union. Later we will add a union
element for the fs/dlm lksb. Create accessors for the status and lvb
fields.
Other than a debugging function, dlmglue.c does not directly reference
the o2dlm locking path anymore.
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Diffstat (limited to 'fs/ocfs2/ocfs2.h')
| -rw-r--r-- | fs/ocfs2/ocfs2.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h index f78e9ed53249..6d7c6d2d0c23 100644 --- a/fs/ocfs2/ocfs2.h +++ b/fs/ocfs2/ocfs2.h @@ -40,7 +40,8 @@ #include "cluster/heartbeat.h" #include "cluster/tcp.h" -#include "dlm/dlmapi.h" +/* For union ocfs2_dlm_lksb */ +#include "stackglue.h" #include "ocfs2_fs.h" #include "ocfs2_lockid.h" @@ -120,7 +121,7 @@ struct ocfs2_lock_res { int l_level; unsigned int l_ro_holders; unsigned int l_ex_holders; - struct dlm_lockstatus l_lksb; + union ocfs2_dlm_lksb l_lksb; /* used from AST/BAST funcs. */ enum ocfs2_ast_action l_action; |