diff options
| author | Philipp Reisner | 2011-01-19 13:12:45 +0100 |
|---|---|---|
| committer | Philipp Reisner | 2011-08-29 11:27:03 +0200 |
| commit | 89e58e755e37137135c28a90c93be1b28faff485 (patch) | |
| tree | d451a7184a8d48b4f8096417375fb618968e505f /drivers/block/drbd/drbd_int.h | |
| parent | drbd: Minimal struct drbd_tconn (diff) | |
| download | kernel-qcow2-linux-89e58e755e37137135c28a90c93be1b28faff485.tar.gz kernel-qcow2-linux-89e58e755e37137135c28a90c93be1b28faff485.tar.xz kernel-qcow2-linux-89e58e755e37137135c28a90c93be1b28faff485.zip | |
drbd: moved net_conf from mdev to tconn
Besides moving the struct member, everything else is generated by:
sed -i -e 's/mdev->net_conf/mdev->tconn->net_conf/g' \
-e 's/odev->net_conf/odev->tconn->net_conf/g' \
*.[ch]
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_int.h')
| -rw-r--r-- | drivers/block/drbd/drbd_int.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index 1f486f001dfd..4c4c276e0eb8 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h @@ -977,7 +977,6 @@ struct drbd_conf { unsigned long flags; /* configured by drbdsetup */ - struct net_conf *net_conf; /* protected by get_net_conf() and put_net_conf() */ struct syncer_conf sync_conf; struct drbd_backing_dev *ldev __protected_by(local); @@ -2134,10 +2133,10 @@ static inline void put_net_conf(struct drbd_conf *mdev) } /** - * get_net_conf() - Increase ref count on mdev->net_conf; Returns 0 if nothing there + * get_net_conf() - Increase ref count on mdev->tconn->net_conf; Returns 0 if nothing there * @mdev: DRBD device. * - * You have to call put_net_conf() when finished working with mdev->net_conf. + * You have to call put_net_conf() when finished working with mdev->tconn->net_conf. */ static inline int get_net_conf(struct drbd_conf *mdev) { @@ -2253,7 +2252,7 @@ static inline int drbd_get_max_buffers(struct drbd_conf *mdev) { int mxb = 1000000; /* arbitrary limit on open requests */ if (get_net_conf(mdev)) { - mxb = mdev->net_conf->max_buffers; + mxb = mdev->tconn->net_conf->max_buffers; put_net_conf(mdev); } return mxb; |