Commit 9e204cdd authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Philipp Reisner
Browse files

drbd: Move some functions to where they are used 



Move drbd_update_congested() to drbd_main.c, and drbd_req_new() and
drbd_req_free() to drbd_req.c: those functions are not used anywhere
else.

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

drivers/block/drbd/drbd_int.h

+0 −7
Original line number Diff line number Diff line
@@ -2355,13 +2355,6 @@ static inline int drbd_set_ed_uuid(struct drbd_conf *mdev, u64 val) 
	return changed;

}



static inline void drbd_update_congested(struct drbd_conf *mdev)

{

	struct sock *sk = mdev->tconn->data.socket->sk;

	if (sk->sk_wmem_queued > sk->sk_sndbuf * 4 / 5)

		set_bit(NET_CONGESTED, &mdev->flags);

}



static inline int drbd_queue_order_type(struct drbd_conf *mdev)

{

	/* sorry, we currently have no working implementation

drivers/block/drbd/drbd_main.c

+7 −0
Original line number Diff line number Diff line
@@ -2528,6 +2528,13 @@ static int we_should_drop_the_connection(struct drbd_conf *mdev, struct socket * 
	return drop_it; /* && (mdev->state == R_PRIMARY) */;

}



static void drbd_update_congested(struct drbd_conf *mdev)

{

	struct sock *sk = mdev->tconn->data.socket->sk;

	if (sk->sk_wmem_queued > sk->sk_sndbuf * 4 / 5)

		set_bit(NET_CONGESTED, &mdev->flags);

}



/* The idea of sendpage seems to be to put some kind of reference

 * to the page into the skb, and to hand it over to the NIC. In

 * this process get_page() gets called.

drivers/block/drbd/drbd_req.c

+29 −0
Original line number Diff line number Diff line
@@ -56,6 +56,35 @@ static void _drbd_end_io_acct(struct drbd_conf *mdev, struct drbd_request *req) 
	part_stat_unlock();

}



static struct drbd_request *drbd_req_new(struct drbd_conf *mdev,

					       struct bio *bio_src)

{

	struct drbd_request *req;



	req = mempool_alloc(drbd_request_mempool, GFP_NOIO);

	if (!req)

		return NULL;



	drbd_req_make_private_bio(req, bio_src);

	req->rq_state    = bio_data_dir(bio_src) == WRITE ? RQ_WRITE : 0;

	req->mdev        = mdev;

	req->master_bio  = bio_src;

	req->epoch       = 0;

	drbd_clear_interval(&req->i);

	req->i.sector     = bio_src->bi_sector;

	req->i.size      = bio_src->bi_size;

	INIT_LIST_HEAD(&req->tl_requests);

	INIT_LIST_HEAD(&req->w.list);



	return req;

}



static void drbd_req_free(struct drbd_request *req)

{

	mempool_free(req, drbd_request_mempool);

}



/* rw is bio_data_dir(), only READ or WRITE */

static void _req_is_done(struct drbd_conf *mdev, struct drbd_request *req, const int rw)

{

	const unsigned long s = req->rq_state;

drivers/block/drbd/drbd_req.h

+0 −26
Original line number Diff line number Diff line
@@ -234,32 +234,6 @@ static inline void drbd_req_make_private_bio(struct drbd_request *req, struct bi 
	bio->bi_next     = NULL;

}



static inline struct drbd_request *drbd_req_new(struct drbd_conf *mdev,

	struct bio *bio_src)

{

	struct drbd_request *req =

		mempool_alloc(drbd_request_mempool, GFP_NOIO);

	if (likely(req)) {

		drbd_req_make_private_bio(req, bio_src);



		req->rq_state    = bio_data_dir(bio_src) == WRITE ? RQ_WRITE : 0;

		req->mdev        = mdev;

		req->master_bio  = bio_src;

		req->epoch       = 0;

		req->i.sector     = bio_src->bi_sector;

		req->i.size      = bio_src->bi_size;

		drbd_clear_interval(&req->i);

		INIT_LIST_HEAD(&req->tl_requests);

		INIT_LIST_HEAD(&req->w.list);

	}

	return req;

}



static inline void drbd_req_free(struct drbd_request *req)

{

	mempool_free(req, drbd_request_mempool);

}



/* Short lived temporary struct on the stack.

 * We could squirrel the error to be returned into

 * bio->bi_size, or similar. But that would be too ugly. */