diff options
| author | Philipp Reisner <philipp.reisner@linbit.com> | 2011-11-09 20:12:34 +0100 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-08 16:58:07 +0100 |
| commit | 4b0007c0e8def19266c767f0410ce81eb39f55c7 (patch) | |
| tree | a73a97a97d36ad66af6210a61162f5a04138b702 /drivers/block/drbd/drbd_int.h | |
| parent | drbd: Move the CREATE_BARRIER flag from connection to device (diff) | |
| download | linux-4b0007c0e8def19266c767f0410ce81eb39f55c7.tar.xz linux-4b0007c0e8def19266c767f0410ce81eb39f55c7.zip | |
drbd: Move write_ordering from mdev to tconn
This is necessary in order to prepare the move of the (receiver side)
epoch list from the device (mdev) to the connection (tconn) objects.
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, 4 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index e3913307e3d0..473694605da6 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h @@ -858,6 +858,8 @@ struct drbd_tconn { /* is a resource from the config file */ void *int_dig_in; void *int_dig_vv; + enum write_ordering_e write_ordering; + struct drbd_thread receiver; struct drbd_thread worker; struct drbd_thread asender; @@ -962,7 +964,7 @@ struct drbd_conf { struct drbd_epoch *current_epoch; spinlock_t epoch_lock; unsigned int epochs; - enum write_ordering_e write_ordering; + 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) */ struct list_head done_ee; /* need to send P_WRITE_ACK */ @@ -1539,7 +1541,7 @@ static inline void drbd_tcp_quickack(struct socket *sock) (char*)&val, sizeof(val)); } -void drbd_bump_write_ordering(struct drbd_conf *mdev, enum write_ordering_e wo); +void drbd_bump_write_ordering(struct drbd_tconn *tconn, enum write_ordering_e wo); /* drbd_proc.c */ extern struct proc_dir_entry *drbd_proc; |