Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6

[linux-2.6] / mm / highmem.c

diff --git a/mm/highmem.c b/mm/highmem.c
index d01276506b004755171f5f545a161cbcae6e12c4..4009115994683b6fe733d56a72589088c7ab6319 100644 (file)
--- a/mm/highmem.c
+++ b/mm/highmem.c
@@ -325,6 +325,7 @@ static void bounce_end_io(struct bio *bio, mempool_t *pool, int err)
                        continue;
 
                mempool_free(bvec->bv_page, pool);      
+               dec_page_state(nr_bounce);
        }
 
        bio_endio(bio_orig, bio_orig->bi_size, err);
@@ -405,6 +406,7 @@ static void __blk_queue_bounce(request_queue_t *q, struct bio **bio_orig,
                to->bv_page = mempool_alloc(pool, q->bounce_gfp);
                to->bv_len = from->bv_len;
                to->bv_offset = from->bv_offset;
+               inc_page_state(nr_bounce);
 
                if (rw == WRITE) {
                        char *vto, *vfrom;