Commit 1ca7318c authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'upstream-linus' of git://

* 'upstream-linus' of git://
  ocfs2: Change some lock status member in ocfs2_lock_res to char.
parents 0143832c 1c66b360
......@@ -159,7 +159,9 @@ struct ocfs2_lock_res {
char l_name[OCFS2_LOCK_ID_MAX_LEN];
unsigned int l_ro_holders;
unsigned int l_ex_holders;
unsigned char l_level;
char l_level;
char l_requested;
char l_blocking;
/* Data packed - type enum ocfs2_lock_type */
unsigned char l_type;
......@@ -169,8 +171,6 @@ struct ocfs2_lock_res {
unsigned char l_action;
/* Data packed - enum type ocfs2_unlock_action */
unsigned char l_unlock_action;
unsigned char l_requested;
unsigned char l_blocking;
unsigned int l_pending_gen;
spinlock_t l_lock;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment