On Wed, Aug 08, 2012 at 04:15:52PM -0700, Tejun Heo wrote:
> On Mon, Aug 06, 2012 at 03:08:39PM -0700, Kent Overstreet wrote:
>
> How about the following?
>
> There was no API to kmalloc bio and clone and osdblk was using
> explicit bio_kmalloc() + __bio_clone(). (my guess here) As this is
> inconvenient and there will be more users of it in the future, add
> bio_clone_kmalloc() and use it in osdblk.
Adding that.
>
> > Acked-by: Boaz Harrosh <bharrosh@xxxxxxxxxxx>
> > Signed-off-by: Kent Overstreet <koverstreet@xxxxxxxxxx>
> > ---
> > drivers/block/osdblk.c | 3 +--
> > fs/bio.c | 13 +++++++++++++
> > fs/exofs/ore.c | 5 ++---
> > include/linux/bio.h | 1 +
> > 4 files changed, 17 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/block/osdblk.c b/drivers/block/osdblk.c
> > index 87311eb..1bbc681 100644
> > --- a/drivers/block/osdblk.c
> > +++ b/drivers/block/osdblk.c
> > @@ -266,11 +266,10 @@ static struct bio *bio_chain_clone(struct bio *old_chain, gfp_t gfpmask)
> > struct bio *tmp, *new_chain = NULL, *tail = NULL;
> >
> > while (old_chain) {
> > - tmp = bio_kmalloc(gfpmask, old_chain->bi_max_vecs);
> > + tmp = bio_clone_kmalloc(old_chain, gfpmask);
> > if (!tmp)
> > goto err_out;
> >
> > - __bio_clone(tmp, old_chain);
> > tmp->bi_bdev = NULL;
> > gfpmask &= ~__GFP_WAIT;
> > tmp->bi_next = NULL;
> > diff --git a/fs/bio.c b/fs/bio.c
> > index f0c865b..77b9313 100644
> > --- a/fs/bio.c
> > +++ b/fs/bio.c
> > @@ -497,6 +497,19 @@ struct bio *bio_clone(struct bio *bio, gfp_t gfp_mask)
> > }
> > EXPORT_SYMBOL(bio_clone);
> >
>
> /**
>
> PLEASE.
>
> > +struct bio *bio_clone_kmalloc(struct bio *bio, gfp_t gfp_mask)
> > +{
> > + struct bio *b = bio_kmalloc(gfp_mask, bio->bi_max_vecs);
>
> Can't we use %NULL bioset as an indication to allocate from kmalloc
> instead of duping interfaces like this?
The two aren't mutually exclusive - but using BIO_KMALLOC_POOL instead
of separate interfaces is an excellent idea, I'll do that.
That means bio_clone_kmalloc will just become:
static inline struct bio *bio_clone_kmalloc(struct bio *bio,
gfp_t gfp_mask)
{
return bio_clone_bioset(bio, gfp_mask, BIO_KMALLOC_POOL)
}
(or maybe NULL there, I think using NULL for the interface makes sense,
I just don't want to use it for bi_pool).
Do you still want the /** for a one line wrapper like that?
>
> Thanks.
>
> --
> tejun
--
dm-devel mailing list
dm-devel@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/dm-devel
