aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_worker.c
diff options
context:
space:
mode:
authorLars Ellenberg <lars.ellenberg@linbit.com>2010-09-06 12:30:25 +0200
committerPhilipp Reisner <philipp.reisner@linbit.com>2010-10-14 18:38:33 +0200
commit435f07402b3165b90592073bc0f8c6f8fa160ff9 (patch)
treecef4df9cde79857ad5590358c5f155c2f8bd84a2 /drivers/block/drbd/drbd_worker.c
parentdrbd: Adding support for BIO/Request flags: REQ_FUA, REQ_FLUSH and REQ_DISCARD (diff)
downloadlinux-dev-435f07402b3165b90592073bc0f8c6f8fa160ff9.tar.xz
linux-dev-435f07402b3165b90592073bc0f8c6f8fa160ff9.zip
drbd: don't count sendpage()d pages only referenced by tcp as in use
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_worker.c')
-rw-r--r--drivers/block/drbd/drbd_worker.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
index 0e5bf8c98293..01743193f321 100644
--- a/drivers/block/drbd/drbd_worker.c
+++ b/drivers/block/drbd/drbd_worker.c
@@ -914,9 +914,13 @@ static void move_to_net_ee_or_free(struct drbd_conf *mdev, struct drbd_epoch_ent
{
if (drbd_ee_has_active_page(e)) {
/* This might happen if sendpage() has not finished */
+ int i = DIV_ROUND_UP(e->size, PAGE_SIZE);
+ atomic_add(i, &mdev->pp_in_use_by_net);
+ atomic_sub(i, &mdev->pp_in_use);
spin_lock_irq(&mdev->req_lock);
list_add_tail(&e->w.list, &mdev->net_ee);
spin_unlock_irq(&mdev->req_lock);
+ wake_up(&drbd_pp_wait);
} else
drbd_free_ee(mdev, e);
}