Commit 6bd70aba authored by David Teigland's avatar David Teigland Committed by Steven Whitehouse
Browse files

[DLM] lock_dlm recover_status patch 



This saves the journal recovery result and makes it visible through sysfs.
User space needs to know if the node actually recovered the journal or
tried and gave up.

Signed-off-by: default avatarDavid Teigland <teigland@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 579b78a4

fs/gfs2/locking/dlm/lock_dlm.h

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ struct gdlm_ls { 
	lm_fsdata_t		*fsdata;

	int			recover_jid;

	int			recover_jid_done;

	int			recover_jid_status;

	spinlock_t		async_lock;

	struct list_head	complete;

	struct list_head	blocking;

fs/gfs2/locking/dlm/mount.c

+1 −0
Original line number Diff line number Diff line
@@ -203,6 +203,7 @@ static void gdlm_recovery_done(lm_lockspace_t *lockspace, unsigned int jid, 
{

	struct gdlm_ls *ls = (struct gdlm_ls *) lockspace;

	ls->recover_jid_done = jid;

	ls->recover_jid_status = message;

	kobject_uevent(&ls->kobj, KOBJ_CHANGE);

}

fs/gfs2/locking/dlm/sysfs.c

+16 −9
Original line number Diff line number Diff line
@@ -110,6 +110,11 @@ static ssize_t recover_done_show(struct gdlm_ls *ls, char *buf) 
	return sprintf(buf, "%d\n", ls->recover_jid_done);

}



static ssize_t recover_status_show(struct gdlm_ls *ls, char *buf)

{

	return sprintf(buf, "%d\n", ls->recover_jid_status);

}



struct gdlm_attr {

	struct attribute attr;

	ssize_t (*show)(struct gdlm_ls *, char *);
@@ -128,6 +133,7 @@ GDLM_ATTR(first, 0444, first_show, NULL); 
GDLM_ATTR(first_done,     0444, first_done_show,     NULL);

GDLM_ATTR(recover,        0644, recover_show,        recover_store);

GDLM_ATTR(recover_done,   0444, recover_done_show,   NULL);

GDLM_ATTR(recover_status, 0444, recover_status_show, NULL);



static struct attribute *gdlm_attrs[] = {

	&gdlm_attr_proto_name.attr,
@@ -139,6 +145,7 @@ static struct attribute *gdlm_attrs[] = { 
	&gdlm_attr_first_done.attr,

	&gdlm_attr_recover.attr,

	&gdlm_attr_recover_done.attr,

	&gdlm_attr_recover_status.attr,

	NULL,

};