From: Andreas Gruenbacher <agruenba@redhat.com>
Date: Sat, 2 Aug 2025 21:41:24 +0000 (+0200)
Subject: gfs2: Simplify refcounting in do_xmote
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4250e683de69a637b93f7c7bda7818b36b1cf32e;p=users%2Fhch%2Fmisc.git

gfs2: Simplify refcounting in do_xmote

In do_xmote(), take the additional glock references close to where those
references are needed.  This will simplify the next commit.

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 f1383e9445be..8a7f947883cd 100644
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
@@ -760,7 +760,6 @@ __acquires(&gl->gl_lockref.lock)
 	spin_lock(&gl->gl_lockref.lock);
 
 skip_inval:
-	gl->gl_lockref.count++;
 	/*
 	 * Check for an error encountered since we called go_sync and go_inval.
 	 * If so, we can't withdraw from the glock code because the withdraw
@@ -803,6 +802,7 @@ skip_inval:
 			if (!test_bit(GLF_CANCELING, &gl->gl_flags))
 				clear_bit(GLF_LOCK, &gl->gl_flags);
 			clear_bit(GLF_DEMOTE_IN_PROGRESS, &gl->gl_flags);
+			gl->gl_lockref.count++;
 			gfs2_glock_queue_work(gl, GL_GLOCK_DFT_HOLD);
 			return;
 		} else {
@@ -818,6 +818,7 @@ skip_inval:
 
 		if (!ret) {
 			/* The operation will be completed asynchronously. */
+			gl->gl_lockref.count++;
 			return;
 		}
 		clear_bit(GLF_PENDING_REPLY, &gl->gl_flags);
@@ -837,6 +838,7 @@ skip_inval:
 
 	/* Complete the operation now. */
 	finish_xmote(gl, target);
+	gl->gl_lockref.count++;
 	gfs2_glock_queue_work(gl, 0);
 }