linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / fs / bio.c

diff --git a/fs/bio.c b/fs/bio.c
index 6a0b9ad..0cba08f 100644 (file)
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -25,12 +25,11 @@
 #include <linux/module.h>
 #include <linux/mempool.h>
 #include <linux/workqueue.h>
-#include <linux/blktrace_api.h>
 #include <scsi/sg.h>           /* for struct sg_iovec */
 
 #define BIO_POOL_SIZE 256
 
-static kmem_cache_t *bio_slab __read_mostly;
+static kmem_cache_t *bio_slab;
 
 #define BIOVEC_NR_POOLS 6
 
@@ -39,7 +38,7 @@ static kmem_cache_t *bio_slab __read_mostly;
  * basically we just need to survive
  */
 #define BIO_SPLIT_ENTRIES 8    
-mempool_t *bio_split_pool __read_mostly;
+mempool_t *bio_split_pool;
 
 struct biovec_slab {
        int nr_vecs;
@@ -636,10 +635,12 @@ static struct bio *__bio_map_user_iov(request_queue_t *q,
                return ERR_PTR(-ENOMEM);
 
        ret = -ENOMEM;
-       pages = kcalloc(nr_pages, sizeof(struct page *), GFP_KERNEL);
+       pages = kmalloc(nr_pages * sizeof(struct page *), GFP_KERNEL);
        if (!pages)
                goto out;
 
+       memset(pages, 0, nr_pages * sizeof(struct page *));
+
        for (i = 0; i < iov_count; i++) {
                unsigned long uaddr = (unsigned long)iov[i].iov_base;
                unsigned long len = iov[i].iov_len;
@@ -1095,9 +1096,6 @@ struct bio_pair *bio_split(struct bio *bi, mempool_t *pool, int first_sectors)
        if (!bp)
                return bp;
 
-       blk_add_trace_pdu_int(bdev_get_queue(bi->bi_bdev), BLK_TA_SPLIT, bi,
-                               bi->bi_sector + first_sectors);
-
        BUG_ON(bi->bi_vcnt != 1);
        BUG_ON(bi->bi_idx != 0);
        atomic_set(&bp->cnt, 3);
@@ -1129,6 +1127,16 @@ struct bio_pair *bio_split(struct bio *bi, mempool_t *pool, int first_sectors)
        return bp;
 }
 
+static void *bio_pair_alloc(gfp_t gfp_flags, void *data)
+{
+       return kmalloc(sizeof(struct bio_pair), gfp_flags);
+}
+
+static void bio_pair_free(void *bp, void *data)
+{
+       kfree(bp);
+}
+
 
 /*
  * create memory pools for biovec's in a bio_set.
@@ -1145,7 +1153,8 @@ static int biovec_create_pools(struct bio_set *bs, int pool_entries, int scale)
                if (i >= scale)
                        pool_entries >>= 1;
 
-               *bvp = mempool_create_slab_pool(pool_entries, bp->slab);
+               *bvp = mempool_create(pool_entries, mempool_alloc_slab,
+                                       mempool_free_slab, bp->slab);
                if (!*bvp)
                        return -ENOMEM;
        }
@@ -1177,12 +1186,15 @@ void bioset_free(struct bio_set *bs)
 
 struct bio_set *bioset_create(int bio_pool_size, int bvec_pool_size, int scale)
 {
-       struct bio_set *bs = kzalloc(sizeof(*bs), GFP_KERNEL);
+       struct bio_set *bs = kmalloc(sizeof(*bs), GFP_KERNEL);
 
        if (!bs)
                return NULL;
 
-       bs->bio_pool = mempool_create_slab_pool(bio_pool_size, bio_slab);
+       memset(bs, 0, sizeof(*bs));
+       bs->bio_pool = mempool_create(bio_pool_size, mempool_alloc_slab,
+                       mempool_free_slab, bio_slab);
+
        if (!bs->bio_pool)
                goto bad;
 
@@ -1235,18 +1247,18 @@ static int __init init_bio(void)
                scale = 4;
 
        /*
-        * Limit number of entries reserved -- mempools are only used when
-        * the system is completely unable to allocate memory, so we only
-        * need enough to make progress.
+        * scale number of entries
         */
-       bvec_pool_entries = 1 + scale;
+       bvec_pool_entries = megabytes * 2;
+       if (bvec_pool_entries > 256)
+               bvec_pool_entries = 256;
 
        fs_bio_set = bioset_create(BIO_POOL_SIZE, bvec_pool_entries, scale);
        if (!fs_bio_set)
                panic("bio: can't allocate bios\n");
 
-       bio_split_pool = mempool_create_kmalloc_pool(BIO_SPLIT_ENTRIES,
-                                                    sizeof(struct bio_pair));
+       bio_split_pool = mempool_create(BIO_SPLIT_ENTRIES,
+                               bio_pair_alloc, bio_pair_free, NULL);
        if (!bio_split_pool)
                panic("bio: can't create split pool\n");