From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D89C1352020 for ; Sun, 23 Aug 2026 14:23:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787495040; cv=none; b=AAZaDWGrwC8jdHh2OXACLhHVHA6uTpIuaYx3D2Jj8+Z3SC7j+aFC6bku/xXMjCD9Opq5hwR1kxvIZiFkKbbC+ZiqVuqOEy6QT3RFrx/DPRnk3UDEe+L6a1x/I591ncIuFwXB/K/RLxIjJvf82XIzLH6lE5Sde30gsvdX/09QJWU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787495040; c=relaxed/simple; bh=neddVx30skECrFRKYhbHGWEsAOKUqSOXqgNE0HSxC0g=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=mn4eczPfNpeIBN7U0z3F0O4G4KUJGmbRrT53WC3VyiQ8p/JZke1EWnMS0/7018MWflQ4fGPYGuSxKkOvkQE2AYVKdnCfEpsLgCBn1UU8iUIjhdRLZMd2vw6q62nfRmx5TQLcLxY9/u2twYIR4pP6p7x82ClWzfoTKx/9JX58V6c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KFowHqWe; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="KFowHqWe" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9EC2D1F000E9; Sun, 23 Aug 2026 14:23:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1787495037; bh=DYRwqfm1gCvsAIADhSTBb7bhsQccw0Dp6UWHLBZIMBo=; h=From:To:Cc:Subject:Date; b=KFowHqWeVK5IrSzEtV86Wiu9AdjJApd2cqnOj4Oef42i58j9SqYLn5HYMxZHvNhP6 zEpxNoLyl64MlwYC+1xfXH+48M62jKm++HzJRkRufCfxopg4h4VFl23R2gEHLTcLBL X0PMDkGQdrIbZG4dtruutdFV6vkCwDhImuSEZenEh4tDdwV7PxAoIubeigwKXVHAhE 7J5jYlpPG3XtT26oIxgO3F2PldoxWM5QkJHV8wpqxWOZL4LDv/2LDHQHwVTzlts2CC f37Hq+yf93tb1/5x5bw9st7pkJShqKgyiLfPcHdNg7R3Kj8LWK9SZvPnNT9atKUJt2 XqVLwRVVjl6Fw== From: Gao Xiang To: linux-erofs@lists.ozlabs.org Cc: LKML , Gao Xiang Subject: [PATCH] erofs: simplify z_erofs_gbuf_growsize() Date: Sun, 23 Aug 2026 22:23:05 +0800 Message-ID: <20260823142306.42533-1-xiang@kernel.org> X-Mailer: git-send-email 2.47.3 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit - Use guard(mutex)() to manage gbuf_resize_mutex; - Nullify tmp_pages after successful allocation, so that the error path becomes clearer. Signed-off-by: Gao Xiang --- fs/erofs/zutil.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/fs/erofs/zutil.c b/fs/erofs/zutil.c index 6b9bfa2ef3b6..960cfe86eeb6 100644 --- a/fs/erofs/zutil.c +++ b/fs/erofs/zutil.c @@ -70,12 +70,10 @@ int z_erofs_gbuf_growsize(unsigned int nrpages) void *ptr, *old_ptr; int last, i, j; - mutex_lock(&gbuf_resize_mutex); + guard(mutex)(&gbuf_resize_mutex); /* avoid shrinking gbufs, since no idea how many fses rely on */ - if (nrpages <= z_erofs_gbuf_nrpages) { - mutex_unlock(&gbuf_resize_mutex); + if (nrpages <= z_erofs_gbuf_nrpages) return 0; - } for (i = 0; i < z_erofs_gbuf_count; ++i) { gbuf = &z_erofs_gbufpool[i]; @@ -89,8 +87,7 @@ int z_erofs_gbuf_growsize(unsigned int nrpages) tmp_pages[j] = gbuf->pages[j]; do { last = j; - j = alloc_pages_bulk(GFP_KERNEL, nrpages, - tmp_pages); + j = alloc_pages_bulk(GFP_KERNEL, nrpages, tmp_pages); if (last == j) goto out; } while (j != nrpages); @@ -101,24 +98,23 @@ int z_erofs_gbuf_growsize(unsigned int nrpages) spin_lock(&gbuf->lock); kfree(gbuf->pages); - gbuf->pages = tmp_pages; old_ptr = gbuf->ptr; + gbuf->pages = tmp_pages; gbuf->ptr = ptr; gbuf->nrpages = nrpages; spin_unlock(&gbuf->lock); - if (old_ptr) - vunmap(old_ptr); + vunmap(old_ptr); + tmp_pages = NULL; } z_erofs_gbuf_nrpages = nrpages; out: - if (i < z_erofs_gbuf_count && tmp_pages) { + if (unlikely(tmp_pages)) { for (j = 0; j < nrpages; ++j) if (tmp_pages[j] && (j >= gbuf->nrpages || tmp_pages[j] != gbuf->pages[j])) __free_page(tmp_pages[j]); kfree(tmp_pages); } - mutex_unlock(&gbuf_resize_mutex); return i < z_erofs_gbuf_count ? -ENOMEM : 0; } -- 2.47.3