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

Commit 045417f7 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Philipp Reisner
Browse files

drbd: Rename drbd_{ ee -> peer_req }_has_active_page 



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

drivers/block/drbd/drbd_int.h

+1 −1
Original line number Diff line number Diff line
@@ -1594,7 +1594,7 @@ static inline int drbd_bio_has_active_page(struct bio *bio) 
	return 0;

}



static inline int drbd_ee_has_active_page(struct drbd_peer_request *peer_req)

static inline int drbd_peer_req_has_active_page(struct drbd_peer_request *peer_req)

{

	struct page *page = peer_req->pages;

	page_chain_for_each(page) {

drivers/block/drbd/drbd_receiver.c

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static void reclaim_finished_net_peer_reqs(struct drbd_conf *mdev, 


	list_for_each_safe(le, tle, &mdev->net_ee) {

		peer_req = list_entry(le, struct drbd_peer_request, w.list);

		if (drbd_ee_has_active_page(peer_req))

		if (drbd_peer_req_has_active_page(peer_req))

			break;

		list_move(le, to_be_freed);

	}

drivers/block/drbd/drbd_worker.c

+1 −1
Original line number Diff line number Diff line
@@ -890,7 +890,7 @@ int drbd_resync_finished(struct drbd_conf *mdev) 
/* helper */

static void move_to_net_ee_or_free(struct drbd_conf *mdev, struct drbd_peer_request *peer_req)

{

	if (drbd_ee_has_active_page(peer_req)) {

	if (drbd_peer_req_has_active_page(peer_req)) {

		/* This might happen if sendpage() has not finished */

		int i = (peer_req->i.size + PAGE_SIZE -1) >> PAGE_SHIFT;

		atomic_add(i, &mdev->pp_in_use_by_net);