lightnvm: make address conversions depend on generic device

On address conversions, use the generic device, instead of the target
device. This allows to use conversions outside of the target's realm.

Signed-off-by: Javier González <javier@cnexlabs.com>
Signed-off-by: Matias Bjørling <mb@lightnvm.io>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
index 63d948cc6dec3b36213dd674d91b363fde9378f8..77901bf17416824a0c9ea3669ec1ce2907f4dbbb 100644 (file)
--- a/drivers/lightnvm/core.c
+++ b/drivers/lightnvm/core.c
@@ -581,7 +581,7 @@ static void nvm_ppa_tgt_to_dev(struct nvm_tgt_dev *tgt_dev,
 
        for (i = 0; i < nr_ppas; i++) {
                nvm_map_to_dev(tgt_dev, &ppa_list[i]);
-               ppa_list[i] = generic_to_dev_addr(tgt_dev, ppa_list[i]);
+               ppa_list[i] = generic_to_dev_addr(tgt_dev->parent, ppa_list[i]);
        }
 }
 
@@ -591,7 +591,7 @@ static void nvm_ppa_dev_to_tgt(struct nvm_tgt_dev *tgt_dev,
        int i;
 
        for (i = 0; i < nr_ppas; i++) {
-               ppa_list[i] = dev_to_generic_addr(tgt_dev, ppa_list[i]);
+               ppa_list[i] = dev_to_generic_addr(tgt_dev->parent, ppa_list[i]);
                nvm_map_to_tgt(tgt_dev, &ppa_list[i]);
        }
 }

diff --git a/include/linux/lightnvm.h b/include/linux/lightnvm.h
index f2549b4b862662032c284891d35da27637e69309..f3b273e543c34d886ef479b0610580a3d97ca917 100644 (file)
--- a/include/linux/lightnvm.h
+++ b/include/linux/lightnvm.h
@@ -397,10 +397,10 @@ struct nvm_dev {
        struct list_head targets;
 };
 
-static inline struct ppa_addr generic_to_dev_addr(struct nvm_tgt_dev *tgt_dev,
+static inline struct ppa_addr generic_to_dev_addr(struct nvm_dev *dev,
                                                  struct ppa_addr r)
 {
-       struct nvm_geo *geo = &tgt_dev->geo;
+       struct nvm_geo *geo = &dev->geo;
        struct ppa_addr l;
 
        if (geo->version == NVM_OCSSD_SPEC_12) {
@@ -424,10 +424,10 @@ static inline struct ppa_addr generic_to_dev_addr(struct nvm_tgt_dev *tgt_dev,
        return l;
 }
 
-static inline struct ppa_addr dev_to_generic_addr(struct nvm_tgt_dev *tgt_dev,
+static inline struct ppa_addr dev_to_generic_addr(struct nvm_dev *dev,
                                                  struct ppa_addr r)
 {
-       struct nvm_geo *geo = &tgt_dev->geo;
+       struct nvm_geo *geo = &dev->geo;
        struct ppa_addr l;
 
        l.ppa = 0;