mirror of
https://github.com/torvalds/linux.git
synced 2026-05-26 16:12:59 +02:00
gfs2: Partially revert "gfs2: do_xmote fixes"
When the lm_lock hook which calls dlm_lock() returns an error,
do_xmote() previously reported the error to the syslog ("lm_lock ret
%d\n") but otherwise ignored it during withdraws. Commit 9947a06d29
("gfs2: do_xmote fixes") changed that to pass the error on to the glock
layer, but the error would then only result in an unconditional BUG() in
finish_xmote(), which doesn't help. Instead, revert to the previous
behavior.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Reviewed-by: Andrew Price <anprice@redhat.com>
This commit is contained in:
parent
4250e683de
commit
418c854759
|
|
@ -832,7 +832,8 @@ __acquires(&gl->gl_lockref.lock)
|
|||
*/
|
||||
} else {
|
||||
fs_err(sdp, "lm_lock ret %d\n", ret);
|
||||
target = gl->gl_state | LM_OUT_ERROR;
|
||||
GLOCK_BUG_ON(gl, !gfs2_withdrawing_or_withdrawn(sdp));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user