Commit 418c8547 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher
Browse files

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 9947a06d
("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: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Reviewed-by: default avatarAndrew Price <anprice@redhat.com>
parent 4250e683

fs/gfs2/glock.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

		}

	}