summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-11-15 00:04:53 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-15 00:04:53 +0300
commit1ca7318cacdac5262492149cf46abc06c95693fa (patch)
treec8532b1cd52ab4858a7550b8e2dd0cb1f5a1eb03 /fs
parent0143832cc96d0bf78486297aad5c8fb2c2ead02a (diff)
parent1c66b360fe26204e2aa14e45086b4a6b8890b1a2 (diff)
downloadlinux-1ca7318cacdac5262492149cf46abc06c95693fa.tar.xz
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.
Diffstat (limited to 'fs')
-rw-r--r--fs/ocfs2/ocfs2.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
index d8408217e3bd..1efea3615589 100644
--- a/fs/ocfs2/ocfs2.h
+++ b/fs/ocfs2/ocfs2.h
@@ -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;