diff options
| author | Philipp Reisner | 2011-05-04 15:10:30 +0200 |
|---|---|---|
| committer | Philipp Reisner | 2012-11-08 16:55:47 +0100 |
| commit | 81fa2e675ccf88035d9308a3c98fe2c2928ace00 (patch) | |
| tree | 492bb7110ef874bbb455fc395f7700f0c7c8277f /drivers/block/drbd/drbd_receiver.c | |
| parent | drbd: Turn no-tcp-cork into tcp-cork={yes|no} (diff) | |
| download | kernel-qcow2-linux-81fa2e675ccf88035d9308a3c98fe2c2928ace00.tar.gz kernel-qcow2-linux-81fa2e675ccf88035d9308a3c98fe2c2928ace00.tar.xz kernel-qcow2-linux-81fa2e675ccf88035d9308a3c98fe2c2928ace00.zip | |
drbd: Refcounting for mdev objects
Preparing removal of drbd_cfg_rwsem
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_receiver.c')
| -rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index b4858bb78940..7156e53b0000 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -844,7 +844,7 @@ int drbd_connected(int vnr, void *p, void *data) * no point in trying again, please go standalone. * -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 net_conf *nc; @@ -878,7 +878,7 @@ static int drbd_connect(struct drbd_tconn *tconn) tconn->meta.socket = s; send_first_packet(tconn, &tconn->meta, P_INITIAL_META); } else { - conn_err(tconn, "Logic error in drbd_connect()\n"); + conn_err(tconn, "Logic error in conn_connect()\n"); goto out_release_sockets; } } @@ -4240,7 +4240,7 @@ void conn_flush_workqueue(struct drbd_tconn *tconn) 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; int rv = SS_UNKNOWN_ERROR; @@ -4636,9 +4636,9 @@ int drbdd_init(struct drbd_thread *thi) conn_info(tconn, "receiver (re)started\n"); do { - h = drbd_connect(tconn); + h = conn_connect(tconn); if (h == 0) { - drbd_disconnect(tconn); + conn_disconnect(tconn); schedule_timeout_interruptible(HZ); } if (h == -1) { @@ -4650,7 +4650,7 @@ int drbdd_init(struct drbd_thread *thi) if (h > 0) drbdd(tconn); - drbd_disconnect(tconn); + conn_disconnect(tconn); conn_info(tconn, "receiver terminated\n"); return 0; |