ocfs2: Fix lvb corruption
Properly ignore LVB flags during a PR downconvert. This avoids an illegal lvb update. Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com> Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
This commit is contained in:
parent
9f737633e6
commit
4b1af77445
|
@ -483,6 +483,10 @@ int dlm_unlock_lock_handler(struct o2net_msg *msg, u32 len, void *data)
|
||||||
|
|
||||||
/* lock was found on queue */
|
/* lock was found on queue */
|
||||||
lksb = lock->lksb;
|
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 */
|
/* unlockast only called on originating node */
|
||||||
if (flags & LKM_PUT_LVB) {
|
if (flags & LKM_PUT_LVB) {
|
||||||
lksb->flags |= DLM_LKSB_PUT_LVB;
|
lksb->flags |= DLM_LKSB_PUT_LVB;
|
||||||
|
@ -632,6 +636,8 @@ retry:
|
||||||
|
|
||||||
spin_lock(&res->spinlock);
|
spin_lock(&res->spinlock);
|
||||||
is_master = (res->owner == dlm->node_num);
|
is_master = (res->owner == dlm->node_num);
|
||||||
|
if (flags & LKM_VALBLK && lock->ml.type != LKM_EXMODE)
|
||||||
|
flags &= ~LKM_VALBLK;
|
||||||
spin_unlock(&res->spinlock);
|
spin_unlock(&res->spinlock);
|
||||||
|
|
||||||
if (is_master) {
|
if (is_master) {
|
||||||
|
|
Loading…
Reference in New Issue