lightnvm: remove _unlocked variant of [get/put]_blk

The [get/put]_blk API enables targets to get ownership of blocks at
runtime. This information is currently not recorded on disk, and the
information is therefore lost on power failure. To restore the
metadata, the [get/put]_blk must persist its metadata. In that case,
we need to control the outer lock, so that we can disable them while
updating the on-disk metadata. Fortunately, the _unlocked versions can
be removed, which allows us to move the lock into the [get/put]_blk
functions.

Signed-off-by: Matias Bjørling <m@bjorling.me>
Signed-off-by: Jens Axboe <axboe@fb.com>

1 files changed, 0 insertions, 6 deletions

diff --git a/include/linux/lightnvm.h b/include/linux/lightnvm.h
index d619f6dde7df..e9836cfb6fde 100644
--- a/include/linux/lightnvm.h
+++ b/include/linux/lightnvm.h
@@ -491,8 +491,6 @@ struct nvmm_type {
         nvmm_remove_tgt_fn *remove_tgt;
 
         /* Block administration callbacks */
-        nvmm_get_blk_fn *get_blk_unlocked;
-        nvmm_put_blk_fn *put_blk_unlocked;
         nvmm_get_blk_fn *get_blk;
         nvmm_put_blk_fn *put_blk;
         nvmm_open_blk_fn *open_blk;
@@ -522,10 +520,6 @@ struct nvmm_type {
 extern int nvm_register_mgr(struct nvmm_type *);
 extern void nvm_unregister_mgr(struct nvmm_type *);
 
-extern struct nvm_block *nvm_get_blk_unlocked(struct nvm_dev *,
-                                        struct nvm_lun *, unsigned long);
-extern void nvm_put_blk_unlocked(struct nvm_dev *, struct nvm_block *);
-
 extern struct nvm_block *nvm_get_blk(struct nvm_dev *, struct nvm_lun *,
                                                                 unsigned long);
 extern void nvm_put_blk(struct nvm_dev *, struct nvm_block *);