linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ritesh Harjani <riteshh@linux.ibm.com>
To: linux-ext4@vger.kernel.org
Cc: "Paul E . McKenney" <paulmck@kernel.org>,
	linux-fsdevel@vger.kernel.org, Jan Kara <jack@suse.com>,
	tytso@mit.edu, "Aneesh Kumar K . V" <aneesh.kumar@linux.ibm.com>,
	Ritesh Harjani <riteshh@linux.ibm.com>
Subject: [RFC 08/20] ext4: mballoc: Simplify error handling in ext4_init_mballoc()
Date: Fri,  1 May 2020 11:59:50 +0530	[thread overview]
Message-ID: <09d1cd052ddb2ac8ea8df5235938d2610b3b8bfe.1588313626.git.riteshh@linux.ibm.com> (raw)
In-Reply-To: <cover.1588313626.git.riteshh@linux.ibm.com>

This patch simplifies error handling logic in ext4_init_mballoc(),
by adding all the cleanups at one place at the end of that function.

There should be no functionality change in this patch.

Signed-off-by: Ritesh Harjani <riteshh@linux.ibm.com>
---
 fs/ext4/mballoc.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 2999b41bb5f8..10f295c61ccb 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -2942,23 +2942,26 @@ int __init ext4_init_mballoc(void)
 	ext4_pspace_cachep = KMEM_CACHE(ext4_prealloc_space,
 					SLAB_RECLAIM_ACCOUNT);
 	if (ext4_pspace_cachep == NULL)
-		return -ENOMEM;
+		goto out;
 
 	ext4_ac_cachep = KMEM_CACHE(ext4_allocation_context,
 				    SLAB_RECLAIM_ACCOUNT);
-	if (ext4_ac_cachep == NULL) {
-		kmem_cache_destroy(ext4_pspace_cachep);
-		return -ENOMEM;
-	}
+	if (ext4_ac_cachep == NULL)
+		goto out_pa_free;
 
 	ext4_free_data_cachep = KMEM_CACHE(ext4_free_data,
 					   SLAB_RECLAIM_ACCOUNT);
-	if (ext4_free_data_cachep == NULL) {
-		kmem_cache_destroy(ext4_pspace_cachep);
-		kmem_cache_destroy(ext4_ac_cachep);
-		return -ENOMEM;
-	}
+	if (ext4_free_data_cachep == NULL)
+		goto out_ac_free;
+
 	return 0;
+
+out_ac_free:
+	kmem_cache_destroy(ext4_ac_cachep);
+out_pa_free:
+	kmem_cache_destroy(ext4_pspace_cachep);
+out:
+	return -ENOMEM;
 }
 
 void ext4_exit_mballoc(void)
-- 
2.21.0


  parent reply	other threads:[~2020-05-01  6:30 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-01  6:29 [RFC 00/20] ext4: Fix ENOSPC error, improve mballoc dbg, other cleanups Ritesh Harjani
2020-05-01  6:29 ` [RFC 01/20] ext4: mballoc: Refactor ext4_mb_discard_preallocations() Ritesh Harjani
2020-05-01  6:29 ` [RFC 02/20] ext4: Introduce percpu seq counter for freeing blocks(PA) to avoid ENOSPC err Ritesh Harjani
2020-05-01 18:31   ` Paul E. McKenney
2020-05-04 22:34     ` Ritesh Harjani
2020-05-05  0:36       ` Paul E. McKenney
2020-05-01  6:29 ` [RFC 03/20] ext4: mballoc: Do print bb_free info even when it is 0 Ritesh Harjani
2020-05-01  6:29 ` [RFC 04/20] ext4: mballoc: Refactor ext4_mb_show_ac() Ritesh Harjani
2020-05-01  6:29 ` [RFC 05/20] ext4: mballoc: Add more mb_debug() msgs Ritesh Harjani
2020-05-01  6:29 ` [RFC 06/20] ext4: mballoc: Correct the mb_debug() format specifier for pa_len var Ritesh Harjani
2020-05-01  6:29 ` [RFC 07/20] ext4: mballoc: Fix few other format specifier in mb_debug() Ritesh Harjani
2020-05-01  6:29 ` Ritesh Harjani [this message]
2020-05-01  6:29 ` [RFC 09/20] ext4: mballoc: Make ext4_mb_use_preallocated() return type as bool Ritesh Harjani
2020-05-01  6:29 ` [RFC 10/20] ext4: mballoc: Remove EXT4_MB_HINT_GOAL_ONLY and it's related code Ritesh Harjani
2020-05-01  6:29 ` [RFC 11/20] ext4: mballoc: Refactor code inside DOUBLE_CHECK into separate function Ritesh Harjani
2020-05-01  6:29 ` [RFC 12/20] ext4: mballoc: Fix possible NULL ptr dereference from mb_cmp_bitmaps() Ritesh Harjani
2020-05-01  6:29 ` [RFC 13/20] ext4: mballoc: Don't BUG if kmalloc or read blk bitmap fail for DOUBLE_CHECK Ritesh Harjani
2020-05-01  6:29 ` [RFC 14/20] ext4: balloc: Use task_pid_nr() helper Ritesh Harjani
2020-05-01  6:29 ` [RFC 15/20] ext4: Use BIT() macro for BH_** state bits Ritesh Harjani
2020-05-01  6:29 ` [RFC 16/20] ext4: Improve ext_debug() msg in case of block allocation failure Ritesh Harjani
2020-05-01  6:29 ` [RFC 17/20] ext4: Replace EXT_DEBUG with __maybe_unused in ext4_ext_handle_unwritten_extents() Ritesh Harjani
2020-05-01  6:30 ` [RFC 18/20] ext4: mballoc: Make mb_debug() implementation to use pr_debug() Ritesh Harjani
2020-05-01  6:30 ` [RFC 19/20] ext4: Make ext_debug() " Ritesh Harjani
2020-05-01  6:30 ` [RFC 20/20] ext4: Add process name and pid in ext4_msg() Ritesh Harjani

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=09d1cd052ddb2ac8ea8df5235938d2610b3b8bfe.1588313626.git.riteshh@linux.ibm.com \
    --to=riteshh@linux.ibm.com \
    --cc=aneesh.kumar@linux.ibm.com \
    --cc=jack@suse.com \
    --cc=linux-ext4@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=paulmck@kernel.org \
    --cc=tytso@mit.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).