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

Commit c74ff8bb authored by Sunil Mushran's avatar Sunil Mushran Committed by Mark Fasheh
Browse files

ocfs2: Cleanup the lockname print in dlmglue.c 



The dentry lock has a different format than other locks. This patch fixes
ocfs2_log_dlm_error() macro to make it print the dentry lock correctly.

Signed-off-by: default avatarSunil Mushran <sunil.mushran@oracle.com>
Acked-by: default avatarJoel Becker <joel.becker@oracle.com>
Signed-off-by: default avatarMark Fasheh <mfasheh@suse.com>
parent 7dc102b7

fs/ocfs2/dlmglue.c

+8 −3
Original line number Original line Diff line number Diff line
@@ -321,8 +321,13 @@ static void ocfs2_schedule_blocked_lock(struct ocfs2_super *osb, 
static inline void ocfs2_recover_from_dlm_error(struct ocfs2_lock_res *lockres,

static inline void ocfs2_recover_from_dlm_error(struct ocfs2_lock_res *lockres,

						int convert);

						int convert);

#define ocfs2_log_dlm_error(_func, _err, _lockres) do {					\

#define ocfs2_log_dlm_error(_func, _err, _lockres) do {					\

	if ((_lockres)->l_type != OCFS2_LOCK_TYPE_DENTRY)				\

		mlog(ML_ERROR, "DLM error %d while calling %s on resource %s\n",	\

		mlog(ML_ERROR, "DLM error %d while calling %s on resource %s\n",	\

		     _err, _func, _lockres->l_name);					\

		     _err, _func, _lockres->l_name);					\

	else										\

		mlog(ML_ERROR, "DLM error %d while calling %s on resource %.*s%08x\n",	\

		     _err, _func, OCFS2_DENTRY_LOCK_INO_START - 1, (_lockres)->l_name,	\

		     (unsigned int)ocfs2_get_dentry_lock_ino(_lockres));		\

} while (0)

} while (0)

static int ocfs2_downconvert_thread(void *arg);

static int ocfs2_downconvert_thread(void *arg);

static void ocfs2_downconvert_on_unlock(struct ocfs2_super *osb,

static void ocfs2_downconvert_on_unlock(struct ocfs2_super *osb,