diff options
| author | Lars Ellenberg <lars.ellenberg@linbit.com> | 2012-03-26 20:55:17 +0200 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-08 16:58:25 +0100 |
| commit | 9ed57dcbda37a1a1fb25ccda4206cc417e54e813 (patch) | |
| tree | 90ba7da0f3a11df687b6e53b95460f77b4d58df9 /drivers/block/drbd/drbd_int.h | |
| parent | drbd: complete_conflicting_writes() should not care about connections (diff) | |
| download | linux-9ed57dcbda37a1a1fb25ccda4206cc417e54e813.tar.xz linux-9ed57dcbda37a1a1fb25ccda4206cc417e54e813.zip | |
drbd: ignore volume number for drbd barrier packet exchange
Transfer log epochs, and therefore P_BARRIER packets,
are per resource, not per volume.
We must not associate them with "some random volume".
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index ab9926e915cb..85769085485d 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h @@ -584,7 +584,7 @@ struct drbd_tl_epoch { }; struct drbd_epoch { - struct drbd_conf *mdev; + struct drbd_tconn *tconn; struct list_head list; unsigned int barrier_nr; atomic_t epoch_size; /* increased on every request added. */ @@ -1060,7 +1060,7 @@ extern int drbd_send_sizes(struct drbd_conf *mdev, int trigger_reply, enum dds_f extern int drbd_send_state(struct drbd_conf *mdev, union drbd_state s); extern int drbd_send_current_state(struct drbd_conf *mdev); extern int drbd_send_sync_param(struct drbd_conf *mdev); -extern void drbd_send_b_ack(struct drbd_conf *mdev, u32 barrier_nr, +extern void drbd_send_b_ack(struct drbd_tconn *tconn, u32 barrier_nr, u32 set_size); extern int drbd_send_ack(struct drbd_conf *, enum drbd_packet, struct drbd_peer_request *); |