Re: [PATCH RESEND] drbd: remove unused argument from drbd_request_prepare and __drbd_make_request

We can remove start_jif since it is not used by drbd_request_prepare,
then remove it from __drbd_make_request further.

Cc: Philipp Reisner <philipp.reisner@linbit.com>
Cc: Lars Ellenberg <lars.ellenberg@linbit.com>
Cc: drbd-dev@lists.linbit.com
Signed-off-by: Guoqing Jiang <redacted>
---
  drivers/block/drbd/drbd_int.h  |  2 +-
  drivers/block/drbd/drbd_main.c |  3 +--
  drivers/block/drbd/drbd_req.c  | 11 ++++-------
  3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index 8f879e5c2f67..8faa31a17b8f 100644
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h

@@ -1449,7 +1449,7 @@ extern void conn_free_crypto(struct drbd_connection *connection);
  
  /* drbd_req */
  extern void do_submit(struct work_struct *ws);
-extern void __drbd_make_request(struct drbd_device *, struct bio *, unsigned long);
+extern void __drbd_make_request(struct drbd_device *, struct bio *);
  extern blk_qc_t drbd_submit_bio(struct bio *bio);
  extern int drbd_read_remote(struct drbd_device *device, struct drbd_request *req);
  extern int is_valid_ar_handle(struct drbd_request *, sector_t);

diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 1c8c18b2a25f..7e5fcce812e1 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c

@@ -2288,7 +2288,6 @@ static void do_retry(struct work_struct *ws)
  	list_for_each_entry_safe(req, tmp, &writes, tl_requests) {
  		struct drbd_device *device = req->device;
  		struct bio *bio = req->master_bio;
-		unsigned long start_jif = req->start_jif;
  		bool expected;
  
  		expected =

@@ -2323,7 +2322,7 @@ static void do_retry(struct work_struct *ws)
  		/* We are not just doing submit_bio_noacct(),
  		 * as we want to keep the start_time information. */
  		inc_ap_bio(device);
-		__drbd_make_request(device, bio, start_jif);
+		__drbd_make_request(device, bio);
  	}
  }
  

diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index 330f851cb8f0..5e5602af9643 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c

@@ -1188,7 +1188,7 @@ static void drbd_queue_write(struct drbd_device *device, struct drbd_request *re
   * Returns ERR_PTR(-ENOMEM) if we cannot allocate a drbd_request.
   */
  static struct drbd_request *
-drbd_request_prepare(struct drbd_device *device, struct bio *bio, unsigned long start_jif)
+drbd_request_prepare(struct drbd_device *device, struct bio *bio)
  {
  	const int rw = bio_data_dir(bio);
  	struct drbd_request *req;

@@ -1416,9 +1416,9 @@ static void drbd_send_and_submit(struct drbd_device *device, struct drbd_request
  		complete_master_bio(device, &m);
  }
  
-void __drbd_make_request(struct drbd_device *device, struct bio *bio, unsigned long start_jif)
+void __drbd_make_request(struct drbd_device *device, struct bio *bio)
  {
-	struct drbd_request *req = drbd_request_prepare(device, bio, start_jif);
+	struct drbd_request *req = drbd_request_prepare(device, bio);
  	if (IS_ERR_OR_NULL(req))
  		return;
  	drbd_send_and_submit(device, req);

@@ -1596,19 +1596,16 @@ void do_submit(struct work_struct *ws)
  blk_qc_t drbd_submit_bio(struct bio *bio)
  {
  	struct drbd_device *device = bio->bi_disk->private_data;
-	unsigned long start_jif;
  
  	blk_queue_split(&bio);
  
-	start_jif = jiffies;
-
  	/*
  	 * what we "blindly" assume:
  	 */
  	D_ASSERT(device, IS_ALIGNED(bio->bi_iter.bi_size, 512));
  
  	inc_ap_bio(device);
-	__drbd_make_request(device, bio, start_jif);
+	__drbd_make_request(device, bio);
  	return BLK_QC_T_NONE;
  }