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

Commit 8f4fe008 authored by Matias Bjørling's avatar Matias Bjørling Committed by Jens Axboe
Browse files

lightnvm: remove nvm_get_bb_tbl and nvm_set_bb_tbl 



Since the merge of gennvm and core, there is no longer a need for the
device specific bad block functions.

Signed-off-by: default avatarMatias Bjørling <matias@cnexlabs.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 583b7058

drivers/lightnvm/core.c

+4 −36
Original line number Diff line number Diff line
@@ -605,33 +605,6 @@ static void nvm_tgt_generic_to_addr_mode(struct nvm_tgt_dev *tgt_dev, 
	}

}



int nvm_set_bb_tbl(struct nvm_dev *dev, struct ppa_addr *ppas, int nr_ppas,

								int type)

{

	struct nvm_rq rqd;

	int ret;



	if (nr_ppas > dev->ops->max_phys_sect) {

		pr_err("nvm: unable to update all sysblocks atomically\n");

		return -EINVAL;

	}



	memset(&rqd, 0, sizeof(struct nvm_rq));



	nvm_set_rqd_ppalist(dev, &rqd, ppas, nr_ppas, 1);

	nvm_generic_to_addr_mode(dev, &rqd);



	ret = dev->ops->set_bb_tbl(dev, &rqd.ppa_addr, rqd.nr_ppas, type);

	nvm_free_rqd_ppalist(dev, &rqd);

	if (ret) {

		pr_err("nvm: sysblk failed bb mark\n");

		return -EINVAL;

	}



	return 0;

}

EXPORT_SYMBOL(nvm_set_bb_tbl);



int nvm_set_tgt_bb_tbl(struct nvm_tgt_dev *tgt_dev, struct ppa_addr *ppas,

		       int nr_ppas, int type)

{
@@ -919,20 +892,15 @@ int nvm_bb_tbl_fold(struct nvm_dev *dev, u8 *blks, int nr_blks) 
}

EXPORT_SYMBOL(nvm_bb_tbl_fold);



int nvm_get_bb_tbl(struct nvm_dev *dev, struct ppa_addr ppa, u8 *blks)

{

	ppa = generic_to_dev_addr(dev, ppa);



	return dev->ops->get_bb_tbl(dev, ppa, blks);

}

EXPORT_SYMBOL(nvm_get_bb_tbl);



int nvm_get_tgt_bb_tbl(struct nvm_tgt_dev *tgt_dev, struct ppa_addr ppa,

		       u8 *blks)

{

	struct nvm_dev *dev = tgt_dev->parent;



	ppa = nvm_trans_ppa(tgt_dev, ppa, TRANS_TGT_TO_DEV);

	ppa = generic_to_dev_addr(dev, ppa);



	return nvm_get_bb_tbl(tgt_dev->parent, ppa, blks);

	return dev->ops->get_bb_tbl(dev, ppa, blks);

}

EXPORT_SYMBOL(nvm_get_tgt_bb_tbl);

include/linux/lightnvm.h

+0 −2
Original line number Diff line number Diff line
@@ -473,7 +473,6 @@ extern struct nvm_dev *nvm_alloc_dev(int); 
extern int nvm_register(struct nvm_dev *);

extern void nvm_unregister(struct nvm_dev *);



extern int nvm_set_bb_tbl(struct nvm_dev *, struct ppa_addr *, int, int);

extern int nvm_set_tgt_bb_tbl(struct nvm_tgt_dev *, struct ppa_addr *,

			      int, int);

extern int nvm_max_phys_sects(struct nvm_tgt_dev *);
@@ -490,7 +489,6 @@ extern int nvm_get_area(struct nvm_tgt_dev *, sector_t *, sector_t); 
extern void nvm_put_area(struct nvm_tgt_dev *, sector_t);

extern void nvm_end_io(struct nvm_rq *, int);

extern int nvm_bb_tbl_fold(struct nvm_dev *, u8 *, int);

extern int nvm_get_bb_tbl(struct nvm_dev *, struct ppa_addr, u8 *);

extern int nvm_get_tgt_bb_tbl(struct nvm_tgt_dev *, struct ppa_addr, u8 *);



extern int nvm_dev_factory(struct nvm_dev *, int flags);