Commit 86563de8 authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

block/drbd: Combine two drbd_submit_peer_request() arguments 



Combine the drbd_submit_peer_request() 'op' and 'op_flags' arguments
into a single argument. This patch does not change any functionality.

Reviewed-by: default avatarChristoph Böhmwalder <christoph.boehmwalder@linbit.com>
Cc: Lars Ellenberg <lars.ellenberg@linbit.com>
Cc: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20220714180729.1065367-15-bvanassche@acm.org


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 9945172a

drivers/block/drbd/drbd_int.h

+1 −2
Original line number Diff line number Diff line
@@ -1547,8 +1547,7 @@ extern bool drbd_rs_c_min_rate_throttle(struct drbd_device *device); 
extern bool drbd_rs_should_slow_down(struct drbd_device *device, sector_t sector,

		bool throttle_if_app_is_waiting);

extern int drbd_submit_peer_request(struct drbd_device *,

				    struct drbd_peer_request *, enum req_op,

				    blk_opf_t, int);

				    struct drbd_peer_request *, blk_opf_t, int);

extern int drbd_free_peer_reqs(struct drbd_device *, struct list_head *);

extern struct drbd_peer_request *drbd_alloc_peer_req(struct drbd_peer_device *, u64,

						     sector_t, unsigned int,

drivers/block/drbd/drbd_receiver.c

+7 −8
Original line number Diff line number Diff line
@@ -1621,8 +1621,7 @@ static void drbd_issue_peer_discard_or_zero_out(struct drbd_device *device, stru 
/* TODO allocate from our own bio_set. */

int drbd_submit_peer_request(struct drbd_device *device,

			     struct drbd_peer_request *peer_req,

			     const enum req_op op, const blk_opf_t op_flags,

			     const int fault_type)

			     const blk_opf_t opf, const int fault_type)

{

	struct bio *bios = NULL;

	struct bio *bio;
@@ -1668,8 +1667,7 @@ int drbd_submit_peer_request(struct drbd_device *device, 
	 * generated bio, but a bio allocated on behalf of the peer.

	 */

next_bio:

	bio = bio_alloc(device->ldev->backing_bdev, nr_pages, op | op_flags,

			GFP_NOIO);

	bio = bio_alloc(device->ldev->backing_bdev, nr_pages, opf, GFP_NOIO);

	/* > peer_req->i.sector, unless this is the first bio */

	bio->bi_iter.bi_sector = sector;

	bio->bi_private = peer_req;
@@ -2060,7 +2058,7 @@ static int recv_resync_read(struct drbd_peer_device *peer_device, sector_t secto 
	spin_unlock_irq(&device->resource->req_lock);



	atomic_add(pi->size >> 9, &device->rs_sect_ev);

	if (drbd_submit_peer_request(device, peer_req, REQ_OP_WRITE, 0,

	if (drbd_submit_peer_request(device, peer_req, REQ_OP_WRITE,

				     DRBD_FAULT_RS_WR) == 0)

		return 0;
@@ -2682,7 +2680,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info * 
		peer_req->flags |= EE_CALL_AL_COMPLETE_IO;

	}



	err = drbd_submit_peer_request(device, peer_req, op, op_flags,

	err = drbd_submit_peer_request(device, peer_req, op | op_flags,

				       DRBD_FAULT_DT_WR);

	if (!err)

		return 0;
@@ -2980,7 +2978,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet 
submit:

	update_receiver_timing_details(connection, drbd_submit_peer_request);

	inc_unacked(device);

	if (drbd_submit_peer_request(device, peer_req, REQ_OP_READ, 0,

	if (drbd_submit_peer_request(device, peer_req, REQ_OP_READ,

				     fault_type) == 0)

		return 0;
@@ -4970,7 +4968,8 @@ static int receive_rs_deallocated(struct drbd_connection *connection, struct pac 
		spin_unlock_irq(&device->resource->req_lock);



		atomic_add(pi->size >> 9, &device->rs_sect_ev);

		err = drbd_submit_peer_request(device, peer_req, op, 0, DRBD_FAULT_RS_WR);

		err = drbd_submit_peer_request(device, peer_req, op,

					       DRBD_FAULT_RS_WR);



		if (err) {

			spin_lock_irq(&device->resource->req_lock);

drivers/block/drbd/drbd_worker.c

+1 −1
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ static int read_for_csum(struct drbd_peer_device *peer_device, sector_t sector, 
	spin_unlock_irq(&device->resource->req_lock);



	atomic_add(size >> 9, &device->rs_sect_ev);

	if (drbd_submit_peer_request(device, peer_req, REQ_OP_READ, 0,

	if (drbd_submit_peer_request(device, peer_req, REQ_OP_READ,

				     DRBD_FAULT_RS_RD) == 0)

		return 0;