On Mon, Jun 30 2008, Kamalesh Babulal wrote:Gah, I can't believe gcc errors on that. This should fix it, I'll integrate with the patchset. diff --git a/fs/bio.c b/fs/bio.c index bc865b1..7761c84 100644 --- a/fs/bio.c +++ b/fs/bio.c @@ -50,7 +50,7 @@ static struct biovec_slab bvec_slabs[BIOVEC_NR_POOLS] __read_mostly = { */ struct bio_set *fs_bio_set; -inline unsigned int bvec_nr_vecs(unsigned short idx) +unsigned int bvec_nr_vecs(unsigned short idx) { return bvec_slabs[idx].nr_vecs; } diff --git a/include/linux/bio.h b/include/linux/bio.h index 62f0be9..0933a14 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -365,7 +365,7 @@ extern struct bio *bio_copy_user_iov(struct request_queue *, struct sg_iovec *, extern int bio_uncopy_user(struct bio *); void zero_fill_bio(struct bio *bio); extern struct bio_vec *bvec_alloc_bs(gfp_t, int, unsigned long *, struct bio_set *); -extern inline unsigned int bvec_nr_vecs(unsigned short idx); +extern unsigned int bvec_nr_vecs(unsigned short idx); /* * bio_set is used to allow other portions of the IO system to -- Jens Axboe --
| Greg Kroah-Hartman | [PATCH 005/196] Chinese: add translation of SubmittingDrivers |
| Linus Torvalds | Linux 2.6.25-rc4 |
| Bart Van Assche | Integration of SCST in the mainstream Linux kernel |
| Andrew Morton | 2.6.23-rc6-mm1 |
git: | |
| Arjan van de Ven | Re: [GIT]: Networking |
| Gerrit Renker | [PATCH 27/37] dccp: Integration of dynamic feature activation - part 2 (server side) |
| Andrew Morton | Re: [BUG] New Kernel Bugs |
| Radu Rendec | htb parallelism on multi-core platforms |
