Commit 4b1af774 authored by Kurt Hackel's avatar Kurt Hackel Committed by Mark Fasheh
Browse files

ocfs2: Fix lvb corruption 



Properly ignore LVB flags during a PR downconvert. This avoids an illegal
lvb update.

Signed-off-by: default avatarKurt Hackel <kurt.hackel@oracle.com>
Signed-off-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
parent 9f737633

fs/ocfs2/dlm/dlmunlock.c

+6 −0
Original line number Diff line number Diff line
@@ -483,6 +483,10 @@ int dlm_unlock_lock_handler(struct o2net_msg *msg, u32 len, void *data) 


	/* lock was found on queue */

	lksb = lock->lksb;

	if (flags & (LKM_VALBLK|LKM_PUT_LVB) &&

	    lock->ml.type != LKM_EXMODE)

		flags &= ~(LKM_VALBLK|LKM_PUT_LVB);



	/* unlockast only called on originating node */

	if (flags & LKM_PUT_LVB) {

		lksb->flags |= DLM_LKSB_PUT_LVB;
@@ -632,6 +636,8 @@ enum dlm_status dlmunlock(struct dlm_ctxt *dlm, struct dlm_lockstatus *lksb, 


	spin_lock(&res->spinlock);

	is_master = (res->owner == dlm->node_num);

	if (flags & LKM_VALBLK && lock->ml.type != LKM_EXMODE)

		flags &= ~LKM_VALBLK;

	spin_unlock(&res->spinlock);



	if (is_master) {