]> git.karo-electronics.de Git - linux-beck.git/commitdiff
drbd: Rename drbd_pp_first_pages_or_try_alloc() to __drbd_alloc_pages()
authorAndreas Gruenbacher <agruen@linbit.com>
Thu, 7 Apr 2011 19:08:50 +0000 (21:08 +0200)
committerPhilipp Reisner <philipp.reisner@linbit.com>
Thu, 8 Nov 2012 15:45:14 +0000 (16:45 +0100)
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
drivers/block/drbd/drbd_receiver.c

index 3f68404a17e8a2a12288d6fc0ed937f15ad57cc4..68914a0d35380bc7882951f8a3273195c7bc4eea 100644 (file)
@@ -150,11 +150,12 @@ static void page_chain_add(struct page **head,
        *head = chain_first;
 }
 
-static struct page *drbd_pp_first_pages_or_try_alloc(struct drbd_conf *mdev, int number)
+static struct page *__drbd_alloc_pages(struct drbd_conf *mdev,
+                                      unsigned int number)
 {
        struct page *page = NULL;
        struct page *tmp = NULL;
-       int i = 0;
+       unsigned int i = 0;
 
        /* Yes, testing drbd_pp_vacant outside the lock is racy.
         * So what. It saves a spin_lock. */
@@ -247,7 +248,7 @@ static struct page *drbd_pp_alloc(struct drbd_conf *mdev, unsigned number, bool
        /* Yes, we may run up to @number over max_buffers. If we
         * follow it strictly, the admin will get it wrong anyways. */
        if (atomic_read(&mdev->pp_in_use) < mdev->tconn->net_conf->max_buffers)
-               page = drbd_pp_first_pages_or_try_alloc(mdev, number);
+               page = __drbd_alloc_pages(mdev, number);
 
        while (page == NULL) {
                prepare_to_wait(&drbd_pp_wait, &wait, TASK_INTERRUPTIBLE);
@@ -255,7 +256,7 @@ static struct page *drbd_pp_alloc(struct drbd_conf *mdev, unsigned number, bool
                drbd_kick_lo_and_reclaim_net(mdev);
 
                if (atomic_read(&mdev->pp_in_use) < mdev->tconn->net_conf->max_buffers) {
-                       page = drbd_pp_first_pages_or_try_alloc(mdev, number);
+                       page = __drbd_alloc_pages(mdev, number);
                        if (page)
                                break;
                }