Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1438270

[PATCH 16/17] lightnvm: make ppa_list const in nvm_set_rqd_list

Show all headers | View raw

The passed by reference ppa list in nvm_set_rqd_list() is updated when
multiple planes are available. In that case, each PPA plane is
incremented when the device side PPA list is created. This prevents the
caller to rely on the PPA list to be unmodified after a call.

Signed-off-by: Matias Bjørling <m@bjorling.me>
---
 drivers/lightnvm/core.c  | 8 +++++---
 include/linux/lightnvm.h | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
index ddc8098..00b64f7 100644
--- a/drivers/lightnvm/core.c
+++ b/drivers/lightnvm/core.c
@@ -237,9 +237,10 @@ void nvm_generic_to_addr_mode(struct nvm_dev *dev, struct nvm_rq *rqd)
 EXPORT_SYMBOL(nvm_generic_to_addr_mode);
 
 int nvm_set_rqd_ppalist(struct nvm_dev *dev, struct nvm_rq *rqd,
-				struct ppa_addr *ppas, int nr_ppas, int vblk)
+			const struct ppa_addr *ppas, int nr_ppas, int vblk)
 {
 	int i, plane_cnt, pl_idx;
+	struct ppa_addr ppa;
 
 	if ((!vblk || dev->plane_mode == NVM_PLANE_SINGLE) && nr_ppas == 1) {
 		rqd->nr_ppas = nr_ppas;
@@ -264,8 +265,9 @@ int nvm_set_rqd_ppalist(struct nvm_dev *dev, struct nvm_rq *rqd,
 
 		for (i = 0; i < nr_ppas; i++) {
 			for (pl_idx = 0; pl_idx < plane_cnt; pl_idx++) {
-				ppas[i].g.pl = pl_idx;
-				rqd->ppa_list[(pl_idx * nr_ppas) + i] = ppas[i];
+				ppa = ppas[i];
+				ppa.g.pl = pl_idx;
+				rqd->ppa_list[(pl_idx * nr_ppas) + i] = ppa;
 			}
 		}
 	}
diff --git a/include/linux/lightnvm.h b/include/linux/lightnvm.h
index e9836cf..ba78b83 100644
--- a/include/linux/lightnvm.h
+++ b/include/linux/lightnvm.h
@@ -534,7 +534,7 @@ extern int nvm_submit_io(struct nvm_dev *, struct nvm_rq *);
 extern void nvm_generic_to_addr_mode(struct nvm_dev *, struct nvm_rq *);
 extern void nvm_addr_to_generic_mode(struct nvm_dev *, struct nvm_rq *);
 extern int nvm_set_rqd_ppalist(struct nvm_dev *, struct nvm_rq *,
-						struct ppa_addr *, int, int);
+					const struct ppa_addr *, int, int);
 extern void nvm_free_rqd_ppalist(struct nvm_dev *, struct nvm_rq *);
 extern int nvm_erase_ppa(struct nvm_dev *, struct ppa_addr *, int);
 extern int nvm_erase_blk(struct nvm_dev *, struct nvm_block *);
-- 
2.1.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[GIT PULL 00/17] LightNVM pull request for 4.8 Matias Bjørling <m@bjorling.me> - 2016-07-07 10:00 +0200
  [PATCH 03/17] lightnvm: initialize ppa_addr in dev_to_generic_addr() Matias Bjørling <m@bjorling.me> - 2016-07-07 10:00 +0200
  [PATCH 06/17] lightnvm: remove checkpatch warning for unsigned ints Matias Bjørling <m@bjorling.me> - 2016-07-07 10:00 +0200
  [PATCH 12/17] lightnvm: remove unused lists from struct rrpc_block Matias Bjørling <m@bjorling.me> - 2016-07-07 10:00 +0200
  [PATCH 13/17] lightnvm: remove _unlocked variant of [get/put]_blk Matias Bjørling <m@bjorling.me> - 2016-07-07 10:00 +0200
  [PATCH 11/17] lightnvm: remove nested lock conflict with mm Matias Bjørling <m@bjorling.me> - 2016-07-07 10:00 +0200
  [PATCH 15/17] lightnvm: fix lun offset calculation for mark blk Matias Bjørling <m@bjorling.me> - 2016-07-07 10:00 +0200
  [PATCH 04/17] nvme: lightnvm: make MLC num_pairs little endian Matias Bjørling <m@bjorling.me> - 2016-07-07 10:00 +0200
  [PATCH 02/17] lightnvm: add media manager mark_blk helper Matias Bjørling <m@bjorling.me> - 2016-07-07 10:00 +0200
  [PATCH 05/17] lightnvm: Make functions not used by ouside static Matias Bjørling <m@bjorling.me> - 2016-07-07 10:00 +0200
  [PATCH 09/17] lightnvm: rename gennvm and update description Matias Bjørling <m@bjorling.me> - 2016-07-07 10:00 +0200
  [PATCH 17/17] lightnvm: make __nvm_submit_ppa static Matias Bjørling <m@bjorling.me> - 2016-07-07 10:00 +0200
  [PATCH 16/17] lightnvm: make ppa_list const in nvm_set_rqd_list Matias Bjørling <m@bjorling.me> - 2016-07-07 10:00 +0200
  [PATCH 07/17] lightnvm: fix checkpatch terse errors Matias Bjørling <m@bjorling.me> - 2016-07-07 10:00 +0200
  [PATCH 10/17] lightnvm: move target mgmt into media mgr Matias Bjørling <m@bjorling.me> - 2016-07-07 10:00 +0200
  [PATCH 14/17] lightnvm: make rrpc_map_page call nvm_get_blk outside locks Matias Bjørling <m@bjorling.me> - 2016-07-07 10:00 +0200
  [PATCH 01/17] lightnvm: break the loop when rqd is not null Matias Bjørling <m@bjorling.me> - 2016-07-07 10:00 +0200
  Re: [GIT PULL 00/17] LightNVM pull request for 4.8 Jens Axboe <axboe@kernel.dk> - 2016-07-07 17:00 +0200

csiph-web