Commit 9aa6543e authored by Dinghao Liu's avatar Dinghao Liu Committed by Ira Weiny
Browse files

nvdimm-btt: simplify code with the scope based resource management 



Use the scope based resource management (defined in
linux/cleanup.h) to automate resource lifetime
control on struct btt_sb *super in discover_arenas().

Signed-off-by: default avatarDinghao Liu <dinghao.liu@zju.edu.cn>
Reviewed-by: default avatarDave Jiang <dave.jiang@intel.com>
Link: https://lore.kernel.org/r/20231214083919.22218-1-dinghao.liu@zju.edu.cn


Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>
parent deb369e0

drivers/nvdimm/btt.c

+4 −9
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/fs.h>

#include <linux/nd.h>

#include <linux/backing-dev.h>

#include <linux/cleanup.h>

#include "btt.h"

#include "nd.h"
@@ -847,23 +848,20 @@ static int discover_arenas(struct btt *btt) 
{

	int ret = 0;

	struct arena_info *arena;

	struct btt_sb *super;

	size_t remaining = btt->rawsize;

	u64 cur_nlba = 0;

	size_t cur_off = 0;

	int num_arenas = 0;



	super = kzalloc(sizeof(*super), GFP_KERNEL);

	struct btt_sb *super __free(kfree) = kzalloc(sizeof(*super), GFP_KERNEL);

	if (!super)

		return -ENOMEM;



	while (remaining) {

		/* Alloc memory for arena */

		arena = alloc_arena(btt, 0, 0, 0);

		if (!arena) {

			ret = -ENOMEM;

			goto out_super;

		}

		if (!arena)

			return -ENOMEM;



		arena->infooff = cur_off;

		ret = btt_info_read(arena, super);
@@ -919,14 +917,11 @@ static int discover_arenas(struct btt *btt) 
	btt->nlba = cur_nlba;

	btt->init_state = INIT_READY;



	kfree(super);

	return ret;



 out:

	kfree(arena);

	free_arenas(btt);

 out_super:

	kfree(super);

	return ret;

}