aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorLars Ellenberg <lars.ellenberg@linbit.com>2012-03-08 05:45:57 -0500
committerPhilipp Reisner <philipp.reisner@linbit.com>2012-05-09 09:16:40 -0400
commit671a74e749af8ca28cae1bfc141f2b3f30b7ad65 (patch)
treeb93d74bead20b8ed828882418fef5f4bffd7ab25 /drivers/block
parent001a88687aff26d62f8b61d55c6973618cf0f72f (diff)
drbd: remove now unused seq_num member from struct drbd_request
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/drbd/drbd_int.h1
-rw-r--r--drivers/block/drbd/drbd_main.c3
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index fe5797f73d88..2f3501169d68 100644
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -712,7 +712,6 @@ struct drbd_request {
712 struct list_head tl_requests; /* ring list in the transfer log */ 712 struct list_head tl_requests; /* ring list in the transfer log */
713 struct bio *master_bio; /* master bio pointer */ 713 struct bio *master_bio; /* master bio pointer */
714 unsigned long rq_state; /* see comments above _req_mod() */ 714 unsigned long rq_state; /* see comments above _req_mod() */
715 int seq_num;
716 unsigned long start_time; 715 unsigned long start_time;
717}; 716};
718 717
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index f6cfc45b862a..02fd1e109cf6 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -2814,8 +2814,7 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req)
2814 2814
2815 p.sector = cpu_to_be64(req->sector); 2815 p.sector = cpu_to_be64(req->sector);
2816 p.block_id = (unsigned long)req; 2816 p.block_id = (unsigned long)req;
2817 p.seq_num = cpu_to_be32(req->seq_num = 2817 p.seq_num = cpu_to_be32(atomic_add_return(1, &mdev->packet_seq));
2818 atomic_add_return(1, &mdev->packet_seq));
2819 2818
2820 dp_flags = bio_flags_to_wire(mdev, req->master_bio->bi_rw); 2819 dp_flags = bio_flags_to_wire(mdev, req->master_bio->bi_rw);
2821 2820