From: Andreas Gruenbacher <agruenba@redhat.com>
Date: Tue, 8 Jul 2025 20:07:17 +0000 (+0200)
Subject: gfs2: Partially revert "gfs2: do_xmote fixes"
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=418c854759341cdf687240bd064de09ce38b92c5;p=users%2Fhch%2Fmisc.git

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 9947a06d29c0
("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>
---

diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
index 8a7f947883cd..5bdb11de5b13 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -832,7 +832,8 @@ skip_inval:
 			 */
 		} 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;
 		}
 	}