Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-13 17:28:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

drbd: drbd_delete_device() takes a struct drbd_conf * now

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:10:11 -07:00
parent 5cc287e0ae
commit ff370e5a9e
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/block/drbd/drbd_int.h
View File

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

12
drivers/block/drbd/drbd_main.c
View File

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

2
drivers/block/drbd/drbd_nl.c
View File

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