drbd: drbd_delete_device() takes a struct drbd_conf * now

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>

diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index 9aca1f40e084c8a9e676ace1e7291bf86b348572..ce56aa08314edd3e0b3411803e1ecd6a075e24f1 100644 (file)
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -1367,7 +1367,7 @@ extern rwlock_t global_state_lock;
 extern int conn_lowest_minor(struct drbd_tconn *tconn);
 enum drbd_ret_code conn_new_minor(struct drbd_tconn *tconn, unsigned int minor, int vnr);
 extern void drbd_free_mdev(struct drbd_conf *mdev);
-extern void drbd_delete_device(unsigned int minor);
+extern void drbd_delete_device(struct drbd_conf *mdev);
 
 struct drbd_tconn *drbd_new_tconn(const char *name);
 extern void drbd_free_tconn(struct drbd_tconn *tconn);

diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 7c63b4d473ff493da5a99bda1b595ee4087c84c0..93a16db8a9998e6092ee9b402eb66fe221099eab 100644 (file)
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -2204,15 +2204,10 @@ static void drbd_release_all_peer_reqs(struct drbd_conf *mdev)
 }
 
 /* caution. no locking. */
-void drbd_delete_device(unsigned int minor)
+void drbd_delete_device(struct drbd_conf *mdev)
 {
-       struct drbd_conf *mdev = minor_to_mdev(minor);
-
-       if (!mdev)
-               return;
-
        idr_remove(&mdev->tconn->volumes, mdev->vnr);
-       idr_remove(&minors, minor);
+       idr_remove(&minors, mdev_to_minor(mdev));
        synchronize_rcu();
 
        /* paranoia asserts */
@@ -2265,7 +2260,8 @@ static void drbd_cleanup(void)
        drbd_genl_unregister();
 
        idr_for_each_entry(&minors, mdev, i)
-               drbd_delete_device(i);
+               drbd_delete_device(mdev);
+
        drbd_destroy_mempools();
        unregister_blkdev(DRBD_MAJOR, "drbd");
 

diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index 0f52b88719c897847b23a200f37313ba5967431c..f08fb6f49cd8bdbf7428a6aa929528883afad8f5 100644 (file)
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -2861,7 +2861,7 @@ static enum drbd_ret_code adm_delete_minor(struct drbd_conf *mdev)
             * we may want to delete a minor from a live replication group.
             */
            mdev->state.role == R_SECONDARY) {
-               drbd_delete_device(mdev_to_minor(mdev));
+               drbd_delete_device(mdev);
                return NO_ERROR;
        } else
                return ERR_MINOR_CONFIGURED;