Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e55c07b authored by Javier González's avatar Javier González Committed by Jens Axboe
Browse files

lightnvm: pblk: remove unnecessary argument 



Remove unnecessary argument on pblk_line_free()

Signed-off-by: default avatarJavier González <javier@cnexlabs.com>
Signed-off-by: default avatarMatias Bjørling <mb@lightnvm.io>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent e13f421b

drivers/lightnvm/pblk-core.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -1337,7 +1337,7 @@ static struct pblk_line *pblk_line_retry(struct pblk *pblk, 
	retry_line->emeta = line->emeta;

	retry_line->emeta = line->emeta;

	retry_line->meta_line = line->meta_line;

	retry_line->meta_line = line->meta_line;





	pblk_line_free(pblk, line);

	pblk_line_free(line);

	l_mg->data_line = retry_line;

	l_mg->data_line = retry_line;

	spin_unlock(&l_mg->free_lock);

	spin_unlock(&l_mg->free_lock);
@@ -1562,7 +1562,7 @@ struct pblk_line *pblk_line_replace_data(struct pblk *pblk) 
	return new;

	return new;

}

}





void pblk_line_free(struct pblk *pblk, struct pblk_line *line)

void pblk_line_free(struct pblk_line *line)

{

{

	kfree(line->map_bitmap);

	kfree(line->map_bitmap);

	kfree(line->invalid_bitmap);

	kfree(line->invalid_bitmap);
@@ -1584,7 +1584,7 @@ static void __pblk_line_put(struct pblk *pblk, struct pblk_line *line) 
	WARN_ON(line->state != PBLK_LINESTATE_GC);

	WARN_ON(line->state != PBLK_LINESTATE_GC);

	line->state = PBLK_LINESTATE_FREE;

	line->state = PBLK_LINESTATE_FREE;

	line->gc_group = PBLK_LINEGC_NONE;

	line->gc_group = PBLK_LINEGC_NONE;

	pblk_line_free(pblk, line);

	pblk_line_free(line);

	spin_unlock(&line->lock);

	spin_unlock(&line->lock);





	atomic_dec(&gc->pipeline_gc);

	atomic_dec(&gc->pipeline_gc);

drivers/lightnvm/pblk-init.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -509,7 +509,7 @@ static void pblk_lines_free(struct pblk *pblk) 
	for (i = 0; i < l_mg->nr_lines; i++) {

	for (i = 0; i < l_mg->nr_lines; i++) {

		line = &pblk->lines[i];

		line = &pblk->lines[i];





		pblk_line_free(pblk, line);

		pblk_line_free(line);

		pblk_line_meta_free(line);

		pblk_line_meta_free(line);

	}

	}

	spin_unlock(&l_mg->free_lock);

	spin_unlock(&l_mg->free_lock);

drivers/lightnvm/pblk.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -766,7 +766,7 @@ struct pblk_line *pblk_line_get_data(struct pblk *pblk); 
struct pblk_line *pblk_line_get_erase(struct pblk *pblk);

struct pblk_line *pblk_line_get_erase(struct pblk *pblk);

int pblk_line_erase(struct pblk *pblk, struct pblk_line *line);

int pblk_line_erase(struct pblk *pblk, struct pblk_line *line);

int pblk_line_is_full(struct pblk_line *line);

int pblk_line_is_full(struct pblk_line *line);

void pblk_line_free(struct pblk *pblk, struct pblk_line *line);

void pblk_line_free(struct pblk_line *line);

void pblk_line_close_meta(struct pblk *pblk, struct pblk_line *line);

void pblk_line_close_meta(struct pblk *pblk, struct pblk_line *line);

void pblk_line_close(struct pblk *pblk, struct pblk_line *line);

void pblk_line_close(struct pblk *pblk, struct pblk_line *line);

void pblk_line_close_ws(struct work_struct *work);

void pblk_line_close_ws(struct work_struct *work);