diff options
| author | Philipp Reisner <philipp.reisner@linbit.com> | 2011-11-09 19:18:00 +0100 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-08 16:58:08 +0100 |
| commit | 12038a3a71ce6fabbcc2956cc8697fcbf729be57 (patch) | |
| tree | 4852bf1216081f37e1cf0708660dcde92a458ec3 /drivers/block/drbd/drbd_int.h | |
| parent | drbd: Prepare epochs per connection (diff) | |
| download | linux-12038a3a71ce6fabbcc2956cc8697fcbf729be57.tar.xz linux-12038a3a71ce6fabbcc2956cc8697fcbf729be57.zip | |
drbd: Move list of epochs from mdev to tconn
This is necessary since the transfer_log on the sending is also
per tconn.
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index 0db20cbb4234..94ec6bfb62a7 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h @@ -859,6 +859,9 @@ struct drbd_tconn { /* is a resource from the config file */ void *int_dig_in; void *int_dig_vv; + struct drbd_epoch *current_epoch; + spinlock_t epoch_lock; + unsigned int epochs; enum write_ordering_e write_ordering; struct drbd_thread receiver; @@ -962,9 +965,6 @@ struct drbd_conf { int open_cnt; u64 *p_uuid; - struct drbd_epoch *current_epoch; - spinlock_t epoch_lock; - unsigned int epochs; struct list_head active_ee; /* IO in progress (P_DATA gets written to disk) */ struct list_head sync_ee; /* IO in progress (P_RS_DATA_REPLY gets written to disk) */ |