drbd: Rename drbd_{ ee -> peer_req }_has_active_page

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>

diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index 9d22a47de7a01cc34e7d6978c7632905c11517e1..bad5d92f83c2ad74c17f8734e044ce4836706c62 100644 (file)
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -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) {

diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 370dc7f390f3a6c514044e5107bf7b55e983becc..10b9276b28f77fa063832234af8b731702fe6820 100644 (file)
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -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);
        }

diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
index befbb56443b847cd919114c0e284b51995f7550e..1fc1c9e930e09fbd00167a8a0620e4992959bb16 100644 (file)
--- a/drivers/block/drbd/drbd_worker.c
+++ b/drivers/block/drbd/drbd_worker.c
@@ -890,7 +890,7 @@ out:
 /* 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);