diff --git a/kmod/src/dlmglue.c b/kmod/src/dlmglue.c index 1e44b0c9..3b9519df 100644 --- a/kmod/src/dlmglue.c +++ b/kmod/src/dlmglue.c @@ -536,11 +536,9 @@ static inline void ocfs2_init_start_time(struct ocfs2_mask_waiter *mw) static void ocfs2_lock_res_init_common(struct ocfs2_super *osb, struct ocfs2_lock_res *res, - enum ocfs2_lock_type type, struct ocfs2_lock_res_ops *ops, void *priv) { - res->l_type = type; res->l_ops = ops; res->l_priv = priv; @@ -3434,10 +3432,10 @@ static unsigned int ocfs2_prepare_downconvert(struct ocfs2_lock_res *lockres, if (lockres->l_level <= new_level) { mlog(ML_ERROR, "lockres %s, lvl %d <= %d, blcklst %d, mask %d, " - "type %d, flags 0x%lx, hold %d %d, act %d %d, req %d, " + "flags 0x%lx, hold %d %d, act %d %d, req %d, " "block %d, pgen %d\n", lockres->l_name, lockres->l_level, new_level, list_empty(&lockres->l_blocked_list), - list_empty(&lockres->l_mask_waiters), lockres->l_type, + list_empty(&lockres->l_mask_waiters), lockres->l_flags, lockres->l_ro_holders, lockres->l_ex_holders, lockres->l_action, lockres->l_unlock_action, lockres->l_requested, diff --git a/kmod/src/dlmglue.h b/kmod/src/dlmglue.h index b21be96a..e3034f9e 100644 --- a/kmod/src/dlmglue.h +++ b/kmod/src/dlmglue.h @@ -109,9 +109,6 @@ struct ocfs2_lock_res { signed char l_requested; signed char l_blocking; - /* Data packed - type enum ocfs2_lock_type */ - unsigned char l_type; - /* used from AST/BAST funcs. */ /* Data packed - enum type ocfs2_ast_action */ unsigned char l_action; @@ -238,12 +235,11 @@ int ocfs2_dlm_init(struct ocfs2_super *osb); void ocfs2_dlm_shutdown(struct ocfs2_super *osb, int hangup_pending); #endif void ocfs2_lock_res_init_once(struct ocfs2_lock_res *res); +#if 0 void ocfs2_inode_lock_res_init(struct ocfs2_lock_res *res, enum ocfs2_lock_type type, unsigned int generation, struct inode *inode); - -#if 0 void ocfs2_dentry_lock_res_init(struct ocfs2_dentry_lock *dl, u64 parent, struct inode *inode); struct ocfs2_file_private;