Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 345798
b: refs/heads/master
c: 6699b65
h: refs/heads/master
v: v3
  • Loading branch information
Philipp Reisner committed Sep 28, 2011
1 parent 77fdb9f commit 033761d
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 392c8801922f51466045ece2f1f2884b8c9cd9a2
refs/heads/master: 6699b6553374e85785fada94ac1e8dfc5629b02e
24 changes: 14 additions & 10 deletions trunk/drivers/block/drbd/drbd_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1801,17 +1801,9 @@ void drbd_init_set_defaults(struct drbd_conf *mdev)
atomic_set(&mdev->ap_in_flight, 0);

mutex_init(&mdev->md_io_mutex);
mutex_init(&mdev->tconn->data.mutex);
mutex_init(&mdev->tconn->meta.mutex);
sema_init(&mdev->tconn->data.work.s, 0);
sema_init(&mdev->tconn->meta.work.s, 0);
mutex_init(&mdev->state_mutex);

spin_lock_init(&mdev->tconn->data.work.q_lock);
spin_lock_init(&mdev->tconn->meta.work.q_lock);

spin_lock_init(&mdev->al_lock);
spin_lock_init(&mdev->tconn->req_lock);
spin_lock_init(&mdev->peer_seq_lock);
spin_lock_init(&mdev->epoch_lock);

Expand All @@ -1821,8 +1813,6 @@ void drbd_init_set_defaults(struct drbd_conf *mdev)
INIT_LIST_HEAD(&mdev->read_ee);
INIT_LIST_HEAD(&mdev->net_ee);
INIT_LIST_HEAD(&mdev->resync_reads);
INIT_LIST_HEAD(&mdev->tconn->data.work.q);
INIT_LIST_HEAD(&mdev->tconn->meta.work.q);
INIT_LIST_HEAD(&mdev->resync_work.list);
INIT_LIST_HEAD(&mdev->unplug_work.list);
INIT_LIST_HEAD(&mdev->go_diskless.list);
Expand Down Expand Up @@ -2179,6 +2169,13 @@ static int drbd_congested(void *congested_data, int bdi_bits)
return r;
}

static void drbd_init_workqueue(struct drbd_work_queue* wq)
{
sema_init(&wq->s, 0);
spin_lock_init(&wq->q_lock);
INIT_LIST_HEAD(&wq->q);
}

struct drbd_tconn *drbd_new_tconn(char *name)
{
struct drbd_tconn *tconn;
Expand All @@ -2191,10 +2188,17 @@ struct drbd_tconn *drbd_new_tconn(char *name)
if (!tconn->name)
goto fail;

spin_lock_init(&tconn->req_lock);
atomic_set(&tconn->net_cnt, 0);
init_waitqueue_head(&tconn->net_cnt_wait);
idr_init(&tconn->volumes);

drbd_init_workqueue(&tconn->data.work);
mutex_init(&tconn->data.mutex);

drbd_init_workqueue(&tconn->meta.work);
mutex_init(&tconn->meta.mutex);

drbd_thread_init(tconn, &tconn->receiver, drbdd_init, "receiver");
drbd_thread_init(tconn, &tconn->worker, drbd_worker, "worker");
drbd_thread_init(tconn, &tconn->asender, drbd_asender, "asender");
Expand Down

0 comments on commit 033761d

Please sign in to comment.