Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c66b360 authored by Tao Ma's avatar Tao Ma Committed by Joel Becker
Browse files

ocfs2: Change some lock status member in ocfs2_lock_res to char. 



Commit 83fd9c7f changes l_level, l_requested and l_blocking of
ocfs2_lock_res from int to unsigned char. But actually it is
initially as -1(ocfs2_lock_res_init_common) which
correspoding to 255 for unsigned char. So the whole dlm lock
mechanism doesn't work now which means a disaster to ocfs2.

Cc: Goldwyn Rodrigues <rgoldwyn@suse.de>
Signed-off-by: default avatarTao Ma <tao.ma@oracle.com>
Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
parent 2d3b07c0

fs/ocfs2/ocfs2.h

+3 −3
Original line number Diff line number Diff line
@@ -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;