Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5df69ece authored by Lars Ellenberg's avatar Lars Ellenberg Committed by Philipp Reisner
Browse files

drbd: __drbd_make_request() is now void 



The previous commit causes __drbd_make_request() to always return 0.
Change it to void.

Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent 5da9c836

drivers/block/drbd/drbd_int.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -1403,7 +1403,7 @@ extern void conn_free_crypto(struct drbd_tconn *tconn); 
extern int proc_details;

extern int proc_details;





/* drbd_req */

/* drbd_req */

extern int __drbd_make_request(struct drbd_conf *, struct bio *, unsigned long);

extern void __drbd_make_request(struct drbd_conf *, struct bio *, unsigned long);

extern int drbd_make_request(struct request_queue *q, struct bio *bio);

extern int drbd_make_request(struct request_queue *q, struct bio *bio);

extern int drbd_read_remote(struct drbd_conf *mdev, struct drbd_request *req);

extern int drbd_read_remote(struct drbd_conf *mdev, struct drbd_request *req);

extern int drbd_merge_bvec(struct request_queue *q, struct bvec_merge_data *bvm, struct bio_vec *bvec);

extern int drbd_merge_bvec(struct request_queue *q, struct bvec_merge_data *bvm, struct bio_vec *bvec);

drivers/block/drbd/drbd_main.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -2236,9 +2236,8 @@ static void do_retry(struct work_struct *ws) 




		/* We are not just doing generic_make_request(),

		/* We are not just doing generic_make_request(),

		 * as we want to keep the start_time information. */

		 * as we want to keep the start_time information. */

		do {

		inc_ap_bio(mdev);

		inc_ap_bio(mdev);

		} while(__drbd_make_request(mdev, bio, start_time));

		__drbd_make_request(mdev, bio, start_time);

	}

	}

}

}

drivers/block/drbd/drbd_req.c

+6 −7
Original line number Original line Diff line number Diff line
@@ -945,7 +945,7 @@ drbd_submit_req_private_bio(struct drbd_request *req) 
		bio_endio(bio, -EIO);

		bio_endio(bio, -EIO);

}

}





int __drbd_make_request(struct drbd_conf *mdev, struct bio *bio, unsigned long start_time)

void __drbd_make_request(struct drbd_conf *mdev, struct bio *bio, unsigned long start_time)

{

{

	const int rw = bio_rw(bio);

	const int rw = bio_rw(bio);

	struct bio_and_error m = { NULL, };

	struct bio_and_error m = { NULL, };
@@ -960,7 +960,7 @@ int __drbd_make_request(struct drbd_conf *mdev, struct bio *bio, unsigned long s 
		 * if user cannot handle io errors, that's not our business. */

		 * if user cannot handle io errors, that's not our business. */

		dev_err(DEV, "could not kmalloc() req\n");

		dev_err(DEV, "could not kmalloc() req\n");

		bio_endio(bio, -ENOMEM);

		bio_endio(bio, -ENOMEM);

		return 0;

		return;

	}

	}

	req->start_time = start_time;

	req->start_time = start_time;
@@ -1039,7 +1039,7 @@ int __drbd_make_request(struct drbd_conf *mdev, struct bio *bio, unsigned long s 
		drbd_submit_req_private_bio(req);

		drbd_submit_req_private_bio(req);

		/* once we have submitted, we must no longer look at req,

		/* once we have submitted, we must no longer look at req,

		 * it may already be destroyed. */

		 * it may already be destroyed. */

		return 0;

		return;

	} else if (no_remote) {

	} else if (no_remote) {

nodata:

nodata:

		if (__ratelimit(&drbd_ratelimit_state))

		if (__ratelimit(&drbd_ratelimit_state))
@@ -1054,7 +1054,7 @@ int __drbd_make_request(struct drbd_conf *mdev, struct bio *bio, unsigned long s 




	if (m.bio)

	if (m.bio)

		complete_master_bio(mdev, &m);

		complete_master_bio(mdev, &m);

	return 0;

	return;

}

}





int drbd_make_request(struct request_queue *q, struct bio *bio)

int drbd_make_request(struct request_queue *q, struct bio *bio)
@@ -1070,9 +1070,8 @@ int drbd_make_request(struct request_queue *q, struct bio *bio) 
	D_ASSERT(bio->bi_size > 0);

	D_ASSERT(bio->bi_size > 0);

	D_ASSERT(IS_ALIGNED(bio->bi_size, 512));

	D_ASSERT(IS_ALIGNED(bio->bi_size, 512));





	do {

	inc_ap_bio(mdev);

	inc_ap_bio(mdev);

	} while (__drbd_make_request(mdev, bio, start_time));

	__drbd_make_request(mdev, bio, start_time);





	return 0;

	return 0;

}

}