diff options
| author | Philipp Reisner <philipp.reisner@linbit.com> | 2011-04-11 21:10:11 -0700 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-08 16:45:15 +0100 |
| commit | ff370e5a9ebaf9499431216a531a196d98283228 (patch) | |
| tree | 9d4b410f4829249e592a93566342eb15af4b543a | |
| parent | 5cc287e0ae77bef615a046a44e17e1d68e23dbb7 (diff) | |
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>
| -rw-r--r-- | drivers/block/drbd/drbd_int.h | 2 | ||||
| -rw-r--r-- | drivers/block/drbd/drbd_main.c | 12 | ||||
| -rw-r--r-- | drivers/block/drbd/drbd_nl.c | 2 |
3 files changed, 6 insertions, 10 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index 9aca1f40e08..ce56aa08314 100644 --- 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 7c63b4d473f..93a16db8a99 100644 --- 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 0f52b88719c..f08fb6f49cd 100644 --- 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; |