renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-26 14:14:01 +08:00
Code

drbd: Refcounting for mdev objects

Browse Source 
Preparing removal of drbd_cfg_rwsem

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-05-04 15:10:30 +02:00
parent bb77d34ecc
commit 81fa2e675c
4 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -867,6 +867,7 @@ struct drbd_tconn { /* is a resource from the config file */
struct drbd_conf { struct drbd_conf {
struct drbd_tconn *tconn; struct drbd_tconn *tconn;
int vnr; /* volume number within the connection */ int vnr; /* volume number within the connection */
struct kref kref;
/* things that are stored as / read from meta data on disk */ /* things that are stored as / read from meta data on disk */
unsigned long flags; unsigned long flags;
@ -1373,7 +1374,7 @@ extern rwlock_t global_state_lock;
extern int conn_lowest_minor(struct drbd_tconn *tconn); 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); enum drbd_ret_code conn_new_minor(struct drbd_tconn *tconn, unsigned int minor, int vnr);
extern void drbd_delete_device(struct drbd_conf *mdev); extern void drbd_minor_destroy(struct kref *kref);
struct drbd_tconn *conn_create(const char *name); struct drbd_tconn *conn_create(const char *name);
extern void conn_destroy(struct kref *kref); extern void conn_destroy(struct kref *kref);

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

@ -2052,7 +2052,6 @@ void drbd_init_set_defaults(struct drbd_conf *mdev)
init_waitqueue_head(&mdev->al_wait); init_waitqueue_head(&mdev->al_wait);
init_waitqueue_head(&mdev->seq_wait); init_waitqueue_head(&mdev->seq_wait);
/* mdev->tconn->agreed_pro_version gets initialized in drbd_connect() */
mdev->write_ordering = WO_bdev_flush; mdev->write_ordering = WO_bdev_flush;
mdev->resync_wenr = LC_FREE; mdev->resync_wenr = LC_FREE;
mdev->peer_max_bio_size = DRBD_MAX_BIO_SIZE_SAFE; mdev->peer_max_bio_size = DRBD_MAX_BIO_SIZE_SAFE;
@ -2272,21 +2271,16 @@ static void drbd_release_all_peer_reqs(struct drbd_conf *mdev)
} }
/* caution. no locking. */ /* caution. no locking. */
void drbd_delete_device(struct drbd_conf *mdev) void drbd_minor_destroy(struct kref *kref)
{ {
struct drbd_conf *mdev = container_of(kref, struct drbd_conf, kref);
struct drbd_tconn *tconn = mdev->tconn; struct drbd_tconn *tconn = mdev->tconn;
idr_remove(&mdev->tconn->volumes, mdev->vnr);
idr_remove(&minors, mdev_to_minor(mdev));
synchronize_rcu();
/* paranoia asserts */ /* paranoia asserts */
D_ASSERT(mdev->open_cnt == 0); D_ASSERT(mdev->open_cnt == 0);
D_ASSERT(list_empty(&mdev->tconn->data.work.q)); D_ASSERT(list_empty(&mdev->tconn->data.work.q));
/* end paranoia asserts */ /* end paranoia asserts */
del_gendisk(mdev->vdisk);
/* cleanup stuff that may have been allocated during /* cleanup stuff that may have been allocated during
* device (re-)configuration or state changes */ * device (re-)configuration or state changes */
@ -2320,6 +2314,7 @@ static void drbd_cleanup(void)
{ {
unsigned int i; unsigned int i;
struct drbd_conf *mdev; struct drbd_conf *mdev;
struct drbd_tconn *tconn, *tmp;
unregister_reboot_notifier(&drbd_notifier); unregister_reboot_notifier(&drbd_notifier);
@ -2337,8 +2332,19 @@ static void drbd_cleanup(void)
drbd_genl_unregister(); drbd_genl_unregister();
down_write(&drbd_cfg_rwsem); down_write(&drbd_cfg_rwsem);
idr_for_each_entry(&minors, mdev, i) idr_for_each_entry(&minors, mdev, i) {
drbd_delete_device(mdev); idr_remove(&minors, mdev_to_minor(mdev));
idr_remove(&mdev->tconn->volumes, mdev->vnr);
del_gendisk(mdev->vdisk);
synchronize_rcu();
kref_put(&mdev->kref, &drbd_minor_destroy);
}
list_for_each_entry_safe(tconn, tmp, &drbd_tconns, all_tconn) {
list_del(&tconn->all_tconn);
synchronize_rcu();
kref_put(&tconn->kref, &conn_destroy);
}
up_write(&drbd_cfg_rwsem); up_write(&drbd_cfg_rwsem);
drbd_destroy_mempools(); drbd_destroy_mempools();
@ -2625,6 +2631,7 @@ enum drbd_ret_code conn_new_minor(struct drbd_tconn *tconn, unsigned int minor,
goto out_idr_remove_vol; goto out_idr_remove_vol;
} }
add_disk(disk); add_disk(disk);
kref_init(&mdev->kref); /* one ref for both idrs and the the add_disk */
/* inherit the connection state */ /* inherit the connection state */
mdev->state.conn = tconn->cstate; mdev->state.conn = tconn->cstate;

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

@ -1065,7 +1065,7 @@ static void conn_reconfig_done(struct drbd_tconn *tconn)
spin_unlock_irq(&tconn->req_lock); spin_unlock_irq(&tconn->req_lock);
if (stop_threads) { if (stop_threads) {
/* asender is implicitly stopped by receiver /* asender is implicitly stopped by receiver
* in drbd_disconnect() */ * in conn_disconnect() */
drbd_thread_stop(&tconn->receiver); drbd_thread_stop(&tconn->receiver);
drbd_thread_stop(&tconn->worker); drbd_thread_stop(&tconn->worker);
} }
@ -3033,7 +3033,11 @@ static enum drbd_ret_code adm_delete_minor(struct drbd_conf *mdev)
* we may want to delete a minor from a live replication group. * we may want to delete a minor from a live replication group.
*/ */
mdev->state.role == R_SECONDARY) { mdev->state.role == R_SECONDARY) {
drbd_delete_device(mdev); idr_remove(&mdev->tconn->volumes, mdev->vnr);
idr_remove(&minors, mdev_to_minor(mdev));
del_gendisk(mdev->vdisk);
synchronize_rcu();
kref_put(&mdev->kref, &drbd_minor_destroy);
return NO_ERROR; return NO_ERROR;
} else } else
return ERR_MINOR_CONFIGURED; return ERR_MINOR_CONFIGURED;

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

@ -844,7 +844,7 @@ int drbd_connected(int vnr, void *p, void *data)
* no point in trying again, please go standalone. * no point in trying again, please go standalone.
* -2 We do not have a network config... * -2 We do not have a network config...
*/ */
static int drbd_connect(struct drbd_tconn *tconn) static int conn_connect(struct drbd_tconn *tconn)
{ {
struct socket *sock, *msock; struct socket *sock, *msock;
struct net_conf *nc; struct net_conf *nc;
@ -878,7 +878,7 @@ static int drbd_connect(struct drbd_tconn *tconn)
tconn->meta.socket = s; tconn->meta.socket = s;
send_first_packet(tconn, &tconn->meta, P_INITIAL_META); send_first_packet(tconn, &tconn->meta, P_INITIAL_META);
} else { } else {
conn_err(tconn, "Logic error in drbd_connect()\n"); conn_err(tconn, "Logic error in conn_connect()\n");
goto out_release_sockets; goto out_release_sockets;
} }
} }
@ -4240,7 +4240,7 @@ void conn_flush_workqueue(struct drbd_tconn *tconn)
wait_for_completion(&barr.done); wait_for_completion(&barr.done);
} }
static void drbd_disconnect(struct drbd_tconn *tconn) static void conn_disconnect(struct drbd_tconn *tconn)
{ {
enum drbd_conns oc; enum drbd_conns oc;
int rv = SS_UNKNOWN_ERROR; int rv = SS_UNKNOWN_ERROR;
@ -4636,9 +4636,9 @@ int drbdd_init(struct drbd_thread *thi)
conn_info(tconn, "receiver (re)started\n"); conn_info(tconn, "receiver (re)started\n");
do { do {
h = drbd_connect(tconn); h = conn_connect(tconn);
if (h == 0) { if (h == 0) {
drbd_disconnect(tconn); conn_disconnect(tconn);
schedule_timeout_interruptible(HZ); schedule_timeout_interruptible(HZ);
} }
if (h == -1) { if (h == -1) {
@ -4650,7 +4650,7 @@ int drbdd_init(struct drbd_thread *thi)
if (h > 0) if (h > 0)
drbdd(tconn); drbdd(tconn);
drbd_disconnect(tconn); conn_disconnect(tconn);
conn_info(tconn, "receiver terminated\n"); conn_info(tconn, "receiver terminated\n");
return 0; return 0;