From: Andreas Gruenbacher <agruenba@redhat.com>
Date: Fri, 5 Feb 2021 17:11:28 +0000 (+0100)
Subject: gfs2: Lock imbalance on error path in gfs2_recover_one
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=834ec3e1ee65029029225a86c12337a6cd385af7;p=linux.git

gfs2: Lock imbalance on error path in gfs2_recover_one

In gfs2_recover_one, fix a sd_log_flush_lock imbalance when a recovery
pass fails.

Fixes: c9ebc4b73799 ("gfs2: allow journal replay to hold sd_log_flush_lock")
Cc: stable@vger.kernel.org # v5.7+
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
---

diff --git a/fs/gfs2/recovery.c b/fs/gfs2/recovery.c
index cff8b9a6612cb..2821737740055 100644
--- a/fs/gfs2/recovery.c
+++ b/fs/gfs2/recovery.c
@@ -512,8 +512,10 @@ void gfs2_recover_func(struct work_struct *work)
 			error = foreach_descriptor(jd, head.lh_tail,
 						   head.lh_blkno, pass);
 			lops_after_scan(jd, error, pass);
-			if (error)
+			if (error) {
+				up_read(&sdp->sd_log_flush_lock);
 				goto fail_gunlock_thaw;
+			}
 		}
 
 		recover_local_statfs(jd, &head);