Commit 3211949f authored by Sunil Mushran's avatar Sunil Mushran Committed by Joel Becker
Browse files

ocfs2: Do not initialize lvb in ocfs2_orphan_scan_lock_res_init() 



We don't access the LVB in our ocfs2_*_lock_res_init() functions.

Since the LVB can become invalid during some cluster recovery
operations, the dlmglue must be able to handle an uninitialized
LVB.

For the orphan scan lock, we initialized an uninitialzed LVB with our
scan sequence number plus one.  This starts a normal orphan scan
cycle.

Signed-off-by: default avatarSunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: default avatarJoel Becker <joel.becker@oracle.com>
parent 692684e1

fs/ocfs2/dlmglue.c

+3 −4
Original line number Diff line number Diff line
@@ -644,14 +644,10 @@ static void ocfs2_nfs_sync_lock_res_init(struct ocfs2_lock_res *res, 
static void ocfs2_orphan_scan_lock_res_init(struct ocfs2_lock_res *res,

					    struct ocfs2_super *osb)

{

	struct ocfs2_orphan_scan_lvb *lvb;



	ocfs2_lock_res_init_once(res);

	ocfs2_build_lock_name(OCFS2_LOCK_TYPE_ORPHAN_SCAN, 0, 0, res->l_name);

	ocfs2_lock_res_init_common(osb, res, OCFS2_LOCK_TYPE_ORPHAN_SCAN,

				   &ocfs2_orphan_scan_lops, osb);

	lvb = ocfs2_dlm_lvb(&res->l_lksb);

	lvb->lvb_version = OCFS2_ORPHAN_LVB_VERSION;

}



void ocfs2_file_lock_res_init(struct ocfs2_lock_res *lockres,
@@ -2386,6 +2382,9 @@ int ocfs2_orphan_scan_lock(struct ocfs2_super *osb, u32 *seqno, int ex) 
	if (ocfs2_dlm_lvb_valid(&lockres->l_lksb) &&

	    lvb->lvb_version == OCFS2_ORPHAN_LVB_VERSION)

		*seqno = be32_to_cpu(lvb->lvb_os_seqno);

	else

		*seqno = osb->osb_orphan_scan.os_seqno + 1;



	return status;

}

fs/ocfs2/journal.c

+1 −0
Original line number Diff line number Diff line
@@ -1952,6 +1952,7 @@ int ocfs2_orphan_scan_init(struct ocfs2_super *osb) 
	atomic_set(&os->os_state, ORPHAN_SCAN_ACTIVE);

	os->os_osb = osb;

	os->os_count = 0;

	os->os_seqno = 0;

	os->os_scantime = CURRENT_TIME;

	mutex_init(&os->os_lock);

CRA Git | Maintained and supported by SUSTech CRA and CCSE