tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
ocfs2: Change some lock status member in ocfs2_lock_res to char.

Linus Torvalds 1ca7318c 0143832c

+3 -3
unified split
+3 -3
fs/ocfs2/ocfs2.h
··· 159 159 char l_name[OCFS2_LOCK_ID_MAX_LEN]; 160 160 unsigned int l_ro_holders; 161 161 unsigned int l_ex_holders; 162 - unsigned char l_level; 162 + char l_level; 163 + char l_requested; 164 + char l_blocking; 163 165 164 166 /* Data packed - type enum ocfs2_lock_type */ 165 167 unsigned char l_type; ··· 171 169 unsigned char l_action; 172 170 /* Data packed - enum type ocfs2_unlock_action */ 173 171 unsigned char l_unlock_action; 174 - unsigned char l_requested; 175 - unsigned char l_blocking; 176 172 unsigned int l_pending_gen; 177 173 178 174 spinlock_t l_lock;