openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ocfs2: Check for refreshing locks in generic unblock function 

Tidy up the exit path a bit too.

Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
This commit is contained in:
Mark Fasheh 2006-09-13 21:02:29 -07:00
parent b80fc012e0
commit f7fbfdd1fc
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
fs/ocfs2/dlmglue.c
View File

@ -2640,22 +2640,22 @@ static int ocfs2_generic_unblock_lock(struct ocfs2_super *osb,
/* if we're blocking an exclusive and we have *any* holders, /* if we're blocking an exclusive and we have *any* holders,
* then requeue. */ * then requeue. */
if ((lockres->l_blocking == LKM_EXMODE) if ((lockres->l_blocking == LKM_EXMODE)
&& (lockres->l_ex_holders || lockres->l_ro_holders)) { && (lockres->l_ex_holders || lockres->l_ro_holders))
spin_unlock_irqrestore(&lockres->l_lock, flags); goto leave_requeue;
ctl->requeue = 1;
ret = 0;
goto leave;
}
/* If it's a PR we're blocking, then only /* If it's a PR we're blocking, then only
* requeue if we've got any EX holders */ * requeue if we've got any EX holders */
if (lockres->l_blocking == LKM_PRMODE && if (lockres->l_blocking == LKM_PRMODE &&
lockres->l_ex_holders) { lockres->l_ex_holders)
spin_unlock_irqrestore(&lockres->l_lock, flags); goto leave_requeue;
ctl->requeue = 1;
ret = 0; /*
goto leave; * Can we get a lock in this state if the holder counts are
} * zero? The meta data unblock code used to check this.
*/
if ((lockres->l_ops->flags & LOCK_TYPE_REQUIRES_REFRESH)
&& (lockres->l_flags & OCFS2_LOCK_REFRESHING))
goto leave_requeue;
/* If we get here, then we know that there are no more /* If we get here, then we know that there are no more
* incompatible holders (and anyone asking for an incompatible * incompatible holders (and anyone asking for an incompatible
@ -2692,6 +2692,13 @@ static int ocfs2_generic_unblock_lock(struct ocfs2_super *osb,
leave: leave:
mlog_exit(ret); mlog_exit(ret);
return ret; return ret;
leave_requeue:
spin_unlock_irqrestore(&lockres->l_lock, flags);
ctl->requeue = 1;
mlog_exit(0);
return 0;
} }
static int ocfs2_data_convert_worker(struct ocfs2_lock_res *lockres, static int ocfs2_data_convert_worker(struct ocfs2_lock_res *lockres,