redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

drbd: Inlined drbd_free_mdev(); it got called only from one place

Browse source 
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
This commit is contained in:
Philipp Reisner 2011-04-11 21:24:24 -07:00
parent ff370e5a9e
commit cd1d9950f6
2 changed files with 7 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/block/drbd/drbd_int.h
View file

@ -1366,7 +1366,6 @@ 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(struct drbd_conf *mdev);
struct drbd_tconn *drbd_new_tconn(const char *name);

25
drivers/block/drbd/drbd_main.c
View file

@ -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;