From c011989ed5eb8bccecb6763974ead957a6bf935d Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Wed, 15 Apr 2009 22:10:27 +0900 Subject: [PATCH] --- yaml --- r: 143962 b: refs/heads/master c: a9e9dc24bbc3e084450a22cf4fb82f5f5d4cbeea h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/bio.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 43a5f4c7decb..fc8ba7d6cdf0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 451a9ebf653d28337ba53ed5b4b70b0b9543cca1 +refs/heads/master: a9e9dc24bbc3e084450a22cf4fb82f5f5d4cbeea diff --git a/trunk/fs/bio.c b/trunk/fs/bio.c index d35588fd6d57..7bbc98f0eda1 100644 --- a/trunk/fs/bio.c +++ b/trunk/fs/bio.c @@ -822,7 +822,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q, return ERR_PTR(-ENOMEM); ret = -ENOMEM; - bio = bio_alloc(gfp_mask, nr_pages); + bio = bio_kmalloc(gfp_mask, nr_pages); if (!bio) goto out_bmd; @@ -946,7 +946,7 @@ static struct bio *__bio_map_user_iov(struct request_queue *q, if (!nr_pages) return ERR_PTR(-EINVAL); - bio = bio_alloc(gfp_mask, nr_pages); + bio = bio_kmalloc(gfp_mask, nr_pages); if (!bio) return ERR_PTR(-ENOMEM); @@ -1130,7 +1130,7 @@ static struct bio *__bio_map_kern(struct request_queue *q, void *data, int offset, i; struct bio *bio; - bio = bio_alloc(gfp_mask, nr_pages); + bio = bio_kmalloc(gfp_mask, nr_pages); if (!bio) return ERR_PTR(-ENOMEM);