Merge tag 'topic/drm-misc-2016-08-31' of git://anongit.freedesktop.org/drm-intel...

[cascardo/linux.git] / drivers / lightnvm / gennvm.h

diff --git a/drivers/lightnvm/gennvm.h b/drivers/lightnvm/gennvm.h
index 04d7c23..8ecfa81 100644 (file)
--- a/drivers/lightnvm/gennvm.h
+++ b/drivers/lightnvm/gennvm.h
@@ -34,20 +34,24 @@ struct gen_lun {
                                         */
 };
 
-struct gen_nvm {
+struct gen_dev {
        struct nvm_dev *dev;
 
        int nr_luns;
        struct gen_lun *luns;
        struct list_head area_list;
+
+       struct mutex lock;
+       struct list_head targets;
 };
 
-struct gennvm_area {
+struct gen_area {
        struct list_head list;
        sector_t begin;
        sector_t end;   /* end is excluded */
 };
-#define gennvm_for_each_lun(bm, lun, i) \
+
+#define gen_for_each_lun(bm, lun, i) \
                for ((i) = 0, lun = &(bm)->luns[0]; \
                        (i) < (bm)->nr_luns; (i)++, lun = &(bm)->luns[(i)])