diff options
Diffstat (limited to 'drivers/block/drbd')
-rw-r--r-- | drivers/block/drbd/drbd_int.h | 1 | ||||
-rw-r--r-- | drivers/block/drbd/drbd_main.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index b914f566ef36..534215885cb4 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h | |||
@@ -572,7 +572,6 @@ struct drbd_request { | |||
572 | struct list_head tl_requests; /* ring list in the transfer log */ | 572 | struct list_head tl_requests; /* ring list in the transfer log */ |
573 | struct bio *master_bio; /* master bio pointer */ | 573 | struct bio *master_bio; /* master bio pointer */ |
574 | unsigned long rq_state; /* see comments above _req_mod() */ | 574 | unsigned long rq_state; /* see comments above _req_mod() */ |
575 | int seq_num; | ||
576 | unsigned long start_time; | 575 | unsigned long start_time; |
577 | }; | 576 | }; |
578 | 577 | ||
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 2aee581c03e2..4a59b8a8ba7a 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c | |||
@@ -1808,7 +1808,7 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req) | |||
1808 | return -EIO; | 1808 | return -EIO; |
1809 | p->sector = cpu_to_be64(req->i.sector); | 1809 | p->sector = cpu_to_be64(req->i.sector); |
1810 | p->block_id = (unsigned long)req; | 1810 | p->block_id = (unsigned long)req; |
1811 | p->seq_num = cpu_to_be32(req->seq_num = atomic_inc_return(&mdev->packet_seq)); | 1811 | p->seq_num = cpu_to_be32(atomic_inc_return(&mdev->packet_seq)); |
1812 | dp_flags = bio_flags_to_wire(mdev, req->master_bio->bi_rw); | 1812 | dp_flags = bio_flags_to_wire(mdev, req->master_bio->bi_rw); |
1813 | if (mdev->state.conn >= C_SYNC_SOURCE && | 1813 | if (mdev->state.conn >= C_SYNC_SOURCE && |
1814 | mdev->state.conn <= C_PAUSED_SYNC_T) | 1814 | mdev->state.conn <= C_PAUSED_SYNC_T) |