diff options
| author | Philipp Reisner | 2011-04-12 06:24:24 +0200 |
|---|---|---|
| committer | Philipp Reisner | 2012-11-08 16:45:16 +0100 |
| commit | cd1d9950f69b46d88002b39652ed0cf3608d008b (patch) | |
| tree | e40e9669a9394253506e06e3b3ec32bb7a3ce748 /drivers/block/drbd/drbd_main.c | |
| parent | drbd: drbd_delete_device() takes a struct drbd_conf * now (diff) | |
| download | kernel-qcow2-linux-cd1d9950f69b46d88002b39652ed0cf3608d008b.tar.gz kernel-qcow2-linux-cd1d9950f69b46d88002b39652ed0cf3608d008b.tar.xz kernel-qcow2-linux-cd1d9950f69b46d88002b39652ed0cf3608d008b.zip | |
drbd: Inlined drbd_free_mdev(); it got called only from one place
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_main.c')
| -rw-r--r-- | drivers/block/drbd/drbd_main.c | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 93a16db8a999..563427bfc274 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -2233,10 +2233,13 @@ void drbd_delete_device(struct drbd_conf *mdev) kfree(mdev->p_uuid); /* mdev->p_uuid = NULL; */ - /* cleanup the rest that has been - * allocated from drbd_new_device - * and actually free the mdev itself */ - drbd_free_mdev(mdev); + kfree(mdev->current_epoch); + if (mdev->bitmap) /* should no longer be there. */ + drbd_bm_cleanup(mdev); + __free_page(mdev->md_io_page); + put_disk(mdev->vdisk); + blk_cleanup_queue(mdev->rq_queue); + kfree(mdev); } static void drbd_cleanup(void) @@ -2551,20 +2554,6 @@ out_no_q: return err; } -/* counterpart of drbd_new_device. - * last part of drbd_delete_device. */ -void drbd_free_mdev(struct drbd_conf *mdev) -{ - kfree(mdev->current_epoch); - if (mdev->bitmap) /* should no longer be there. */ - drbd_bm_cleanup(mdev); - __free_page(mdev->md_io_page); - put_disk(mdev->vdisk); - blk_cleanup_queue(mdev->rq_queue); - kfree(mdev); -} - - int __init drbd_init(void) { int err; |