mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-14 04:41:26 +00:00
ocfs2: handle async EAGAIN from NOQUEUE request
When using fsdlm, -EAGAIN is returned in the async callback for NOQUEUE requests. Fix up dlmglue to expect this. Signed-off-by: David Teigland <teigland@redhat.com> Signed-off-by: Joel Becker <joel.becker@oracle.com> Signed-off-by: Mark Fasheh <mfasheh@suse.com>
This commit is contained in:
parent
de551246e7
commit
1693a5c011
@ -880,13 +880,20 @@ static void ocfs2_locking_ast(void *opaque)
|
|||||||
struct ocfs2_lock_res *lockres = opaque;
|
struct ocfs2_lock_res *lockres = opaque;
|
||||||
struct ocfs2_super *osb = ocfs2_get_lockres_osb(lockres);
|
struct ocfs2_super *osb = ocfs2_get_lockres_osb(lockres);
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
int status;
|
||||||
|
|
||||||
spin_lock_irqsave(&lockres->l_lock, flags);
|
spin_lock_irqsave(&lockres->l_lock, flags);
|
||||||
|
|
||||||
if (ocfs2_dlm_lock_status(&lockres->l_lksb)) {
|
status = ocfs2_dlm_lock_status(&lockres->l_lksb);
|
||||||
|
|
||||||
|
if (status == -EAGAIN) {
|
||||||
|
lockres_clear_flags(lockres, OCFS2_LOCK_BUSY);
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (status) {
|
||||||
mlog(ML_ERROR, "lockres %s: lksb status value of %d!\n",
|
mlog(ML_ERROR, "lockres %s: lksb status value of %d!\n",
|
||||||
lockres->l_name,
|
lockres->l_name, status);
|
||||||
ocfs2_dlm_lock_status(&lockres->l_lksb));
|
|
||||||
spin_unlock_irqrestore(&lockres->l_lock, flags);
|
spin_unlock_irqrestore(&lockres->l_lock, flags);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -909,7 +916,7 @@ static void ocfs2_locking_ast(void *opaque)
|
|||||||
lockres->l_unlock_action);
|
lockres->l_unlock_action);
|
||||||
BUG();
|
BUG();
|
||||||
}
|
}
|
||||||
|
out:
|
||||||
/* set it to something invalid so if we get called again we
|
/* set it to something invalid so if we get called again we
|
||||||
* can catch it. */
|
* can catch it. */
|
||||||
lockres->l_action = OCFS2_AST_INVALID;
|
lockres->l_action = OCFS2_AST_INVALID;
|
||||||
@ -1113,6 +1120,7 @@ static int ocfs2_cluster_lock(struct ocfs2_super *osb,
|
|||||||
int ret = 0; /* gcc doesn't realize wait = 1 guarantees ret is set */
|
int ret = 0; /* gcc doesn't realize wait = 1 guarantees ret is set */
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
unsigned int gen;
|
unsigned int gen;
|
||||||
|
int noqueue_attempted = 0;
|
||||||
|
|
||||||
mlog_entry_void();
|
mlog_entry_void();
|
||||||
|
|
||||||
@ -1157,6 +1165,13 @@ again:
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (level > lockres->l_level) {
|
if (level > lockres->l_level) {
|
||||||
|
if (noqueue_attempted > 0) {
|
||||||
|
ret = -EAGAIN;
|
||||||
|
goto unlock;
|
||||||
|
}
|
||||||
|
if (lkm_flags & DLM_LKF_NOQUEUE)
|
||||||
|
noqueue_attempted = 1;
|
||||||
|
|
||||||
if (lockres->l_action != OCFS2_AST_INVALID)
|
if (lockres->l_action != OCFS2_AST_INVALID)
|
||||||
mlog(ML_ERROR, "lockres %s has action %u pending\n",
|
mlog(ML_ERROR, "lockres %s has action %u pending\n",
|
||||||
lockres->l_name, lockres->l_action);
|
lockres->l_name, lockres->l_action);
|
||||||
@ -1621,6 +1636,10 @@ int ocfs2_file_lock(struct file *file, int ex, int trylock)
|
|||||||
* to just bubble sucess back up to the user.
|
* to just bubble sucess back up to the user.
|
||||||
*/
|
*/
|
||||||
ret = ocfs2_flock_handle_signal(lockres, level);
|
ret = ocfs2_flock_handle_signal(lockres, level);
|
||||||
|
} else if (!ret && (level > lockres->l_level)) {
|
||||||
|
/* Trylock failed asynchronously */
|
||||||
|
BUG_ON(!trylock);
|
||||||
|
ret = -EAGAIN;
|
||||||
}
|
}
|
||||||
|
|
||||||
out:
|
out:
|
||||||
|
Loading…
Reference in New Issue
Block a user