Commit 2f8c9011 authored by Vishal Verma's avatar Vishal Verma Committed by Dan Williams
Browse files

libnvdimm/btt: Remove unnecessary code in btt_freelist_init 



We call btt_log_read() twice, once to get the 'old' log entry, and again
to get the 'new' entry. However, we have no use for the 'old' entry, so
remove it.

Cc: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarVishal Verma <vishal.l.verma@intel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 0171b6b7

drivers/nvdimm/btt.c

+2 −6
Original line number Original line Diff line number Diff line
@@ -541,9 +541,9 @@ static int arena_clear_freelist_error(struct arena_info *arena, u32 lane) 




static int btt_freelist_init(struct arena_info *arena)

static int btt_freelist_init(struct arena_info *arena)

{

{

	int old, new, ret;

	int new, ret;

	u32 i, map_entry;

	u32 i, map_entry;

	struct log_entry log_new, log_old;

	struct log_entry log_new;





	arena->freelist = kcalloc(arena->nfree, sizeof(struct free_entry),

	arena->freelist = kcalloc(arena->nfree, sizeof(struct free_entry),

					GFP_KERNEL);

					GFP_KERNEL);
@@ -551,10 +551,6 @@ static int btt_freelist_init(struct arena_info *arena) 
		return -ENOMEM;

		return -ENOMEM;





	for (i = 0; i < arena->nfree; i++) {

	for (i = 0; i < arena->nfree; i++) {

		old = btt_log_read(arena, i, &log_old, LOG_OLD_ENT);

		if (old < 0)

			return old;



		new = btt_log_read(arena, i, &log_new, LOG_NEW_ENT);

		new = btt_log_read(arena, i, &log_new, LOG_NEW_ENT);

		if (new < 0)

		if (new < 0)

			return new;

			return new;

CRA Git | Maintained and supported by SUSTech CRA and CCSE