mirror of
https://github.com/torvalds/linux.git
synced 2026-05-26 08:02:27 +02:00
gfs2: Minor do_xmote cancelation fix
Commit6cb3b1c2dfchanged how finish_xmote() clears the GLF_LOCK flag, but it failed to adjust the equivalent code in do_xmote(). Fix that. Fixes:6cb3b1c2df("gfs2: Fix additional unlikely request cancelation race") Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
This commit is contained in:
parent
2c6e2cb9e7
commit
75bb2ddea9
|
|
@ -802,7 +802,8 @@ __acquires(&gl->gl_lockref.lock)
|
|||
* We skip telling dlm to do the locking, so we won't get a
|
||||
* reply that would otherwise clear GLF_LOCK. So we clear it here.
|
||||
*/
|
||||
clear_bit(GLF_LOCK, &gl->gl_flags);
|
||||
if (!test_bit(GLF_CANCELING, &gl->gl_flags))
|
||||
clear_bit(GLF_LOCK, &gl->gl_flags);
|
||||
clear_bit(GLF_DEMOTE_IN_PROGRESS, &gl->gl_flags);
|
||||
gfs2_glock_queue_work(gl, GL_GLOCK_DFT_HOLD);
|
||||
return;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user