commit b2fb6dbe52dafa3cd18e0665937a0ebcc0892b92
author Philipp Reisner <philipp.reisner@linbit.com> Wed Jan 19 13:48:44 2011 +0100
committer Philipp Reisner <philipp.reisner@linbit.com> Mon Aug 29 11:27:04 2011 +0200
tree d229888ded18fcbb506882c6010132dc0a018c91
parent 89e58e755e37137135c28a90c93be1b28faff485

drbd: moved net_cont and net_cnt_wait from mdev to tconn

Patch partly generated by:

sed -i -e 's/get_net_conf(mdev)/get_net_conf(mdev->tconn)/g' \
       -e 's/put_net_conf(mdev)/put_net_conf(mdev->tconn)/g' \
       -e 's/get_net_conf(odev)/get_net_conf(odev->tconn)/g' \
       -e 's/put_net_conf(odev)/put_net_conf(odev->tconn)/g' \
       *.[ch]

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>

drivers/block/drbd/drbd_req.c

diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index 2b2662d..8f1e7db 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -323,7 +323,7 @@
 
 	D_ASSERT(drbd_interval_empty(&req->i));
 
-	if (!get_net_conf(mdev))
+	if (!get_net_conf(mdev->tconn))
 		return 0;
 
 	i = drbd_find_overlap(&mdev->write_requests, sector, size);
@@ -359,11 +359,11 @@
 
 	/* this is like it should be, and what we expected.
 	 * our users do behave after all... */
-	put_net_conf(mdev);
+	put_net_conf(mdev->tconn);
 	return 0;
 
 out_conflict:
-	put_net_conf(mdev);
+	put_net_conf(mdev->tconn);
 	return 1;
 }
 
@@ -1181,9 +1181,9 @@
 	struct list_head *le;
 	unsigned long et = 0; /* effective timeout = ko_count * timeout */
 
-	if (get_net_conf(mdev)) {
+	if (get_net_conf(mdev->tconn)) {
 		et = mdev->tconn->net_conf->timeout*HZ/10 * mdev->tconn->net_conf->ko_count;
-		put_net_conf(mdev);
+		put_net_conf(mdev->tconn);
 	}
 	if (!et || mdev->state.conn < C_WF_REPORT_PARAMS)
 		return; /* Recurring timer stopped */