From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Kent Overstreet <kent.overstreet@gmail.com>
Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org,
axboe@kernel.dk, hch@infradead.org, colyli@suse.de,
snitzer@redhat.com, clm@fb.com, bacik@fb.com,
linux-xfs@vger.kernel.org, drbd-dev@lists.linbit.com,
linux-btrfs@vger.kernel.org, linux-raid@vger.kernel.org,
neilb@suse.com
Subject: Re: [PATCH 11/12] xfs: convert to bioset_init()/mempool_init()
Date: Mon, 21 May 2018 11:39:36 -0700 [thread overview]
Message-ID: <20180521183936.GJ23858@magnolia> (raw)
In-Reply-To: <20180520222558.7053-12-kent.overstreet@gmail.com>
On Sun, May 20, 2018 at 06:25:57PM -0400, Kent Overstreet wrote:
> Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Looks ok, I guess...
Acked-by: Darrick J. Wong <darrick.wong@oracle.com>
--D
> ---
> fs/xfs/xfs_aops.c | 2 +-
> fs/xfs/xfs_aops.h | 2 +-
> fs/xfs/xfs_super.c | 11 +++++------
> 3 files changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
> index 0ab824f574..102463543d 100644
> --- a/fs/xfs/xfs_aops.c
> +++ b/fs/xfs/xfs_aops.c
> @@ -594,7 +594,7 @@ xfs_alloc_ioend(
> struct xfs_ioend *ioend;
> struct bio *bio;
>
> - bio = bio_alloc_bioset(GFP_NOFS, BIO_MAX_PAGES, xfs_ioend_bioset);
> + bio = bio_alloc_bioset(GFP_NOFS, BIO_MAX_PAGES, &xfs_ioend_bioset);
> xfs_init_bio_from_bh(bio, bh);
>
> ioend = container_of(bio, struct xfs_ioend, io_inline_bio);
> diff --git a/fs/xfs/xfs_aops.h b/fs/xfs/xfs_aops.h
> index 69346d460d..694c85b038 100644
> --- a/fs/xfs/xfs_aops.h
> +++ b/fs/xfs/xfs_aops.h
> @@ -18,7 +18,7 @@
> #ifndef __XFS_AOPS_H__
> #define __XFS_AOPS_H__
>
> -extern struct bio_set *xfs_ioend_bioset;
> +extern struct bio_set xfs_ioend_bioset;
>
> /*
> * Types of I/O for bmap clustering and I/O completion tracking.
> diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
> index d714240529..f643d76db5 100644
> --- a/fs/xfs/xfs_super.c
> +++ b/fs/xfs/xfs_super.c
> @@ -63,7 +63,7 @@
> #include <linux/parser.h>
>
> static const struct super_operations xfs_super_operations;
> -struct bio_set *xfs_ioend_bioset;
> +struct bio_set xfs_ioend_bioset;
>
> static struct kset *xfs_kset; /* top-level xfs sysfs dir */
> #ifdef DEBUG
> @@ -1845,10 +1845,9 @@ MODULE_ALIAS_FS("xfs");
> STATIC int __init
> xfs_init_zones(void)
> {
> - xfs_ioend_bioset = bioset_create(4 * MAX_BUF_PER_PAGE,
> + if (bioset_init(&xfs_ioend_bioset, 4 * MAX_BUF_PER_PAGE,
> offsetof(struct xfs_ioend, io_inline_bio),
> - BIOSET_NEED_BVECS);
> - if (!xfs_ioend_bioset)
> + BIOSET_NEED_BVECS))
> goto out;
>
> xfs_log_ticket_zone = kmem_zone_init(sizeof(xlog_ticket_t),
> @@ -1997,7 +1996,7 @@ xfs_init_zones(void)
> out_destroy_log_ticket_zone:
> kmem_zone_destroy(xfs_log_ticket_zone);
> out_free_ioend_bioset:
> - bioset_free(xfs_ioend_bioset);
> + bioset_exit(&xfs_ioend_bioset);
> out:
> return -ENOMEM;
> }
> @@ -2029,7 +2028,7 @@ xfs_destroy_zones(void)
> kmem_zone_destroy(xfs_btree_cur_zone);
> kmem_zone_destroy(xfs_bmap_free_item_zone);
> kmem_zone_destroy(xfs_log_ticket_zone);
> - bioset_free(xfs_ioend_bioset);
> + bioset_exit(&xfs_ioend_bioset);
> }
>
> STATIC int __init
> --
> 2.17.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2018-05-21 18:40 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-20 22:25 [PATCH 00/13] convert block layer to bioset_init()/mempool_init() Kent Overstreet
2018-05-20 22:25 ` [PATCH 01/12] block: convert bounce, q->bio_split " Kent Overstreet
2018-05-22 10:08 ` Christoph Hellwig
2018-05-20 22:25 ` [PATCH 02/12] drbd: convert " Kent Overstreet
2018-05-20 22:25 ` [PATCH 03/12] pktcdvd: " Kent Overstreet
2018-05-20 22:25 ` [PATCH 04/12] lightnvm: " Kent Overstreet
2018-05-22 10:10 ` Javier Gonzalez
2018-05-20 22:25 ` [PATCH 05/12] bcache: " Kent Overstreet
2018-05-21 3:58 ` Coly Li
2018-05-20 22:25 ` [PATCH 06/12] md: " Kent Overstreet
2018-06-01 10:51 ` Arnd Bergmann
2018-05-20 22:25 ` [PATCH 07/12] dm: " Kent Overstreet
2018-05-30 19:27 ` Mike Snitzer
2018-05-20 22:25 ` [PATCH 08/12] target: " Kent Overstreet
2018-05-22 10:09 ` Christoph Hellwig
2018-05-20 22:25 ` [PATCH 09/12] fs: convert block_dev.c to bioset_init() Kent Overstreet
2018-05-22 10:09 ` Christoph Hellwig
2018-05-20 22:25 ` [PATCH 10/12] btrfs: convert to bioset_init()/mempool_init() Kent Overstreet
2018-05-30 21:30 ` Chris Mason
2018-05-20 22:25 ` [PATCH 11/12] xfs: " Kent Overstreet
2018-05-21 18:39 ` Darrick J. Wong [this message]
2018-05-22 10:10 ` Christoph Hellwig
2018-05-20 22:25 ` [PATCH 12/12] block: Drop bioset_create() Kent Overstreet
2018-05-22 10:10 ` Christoph Hellwig
2018-05-20 23:08 ` [PATCH 00/13] convert block layer to bioset_init()/mempool_init() NeilBrown
2018-05-20 23:11 ` Kent Overstreet
2018-05-21 14:03 ` Mike Snitzer
2018-05-21 14:19 ` Jens Axboe
2018-05-21 14:31 ` Mike Snitzer
2018-05-21 14:36 ` Jens Axboe
2018-05-21 14:47 ` Mike Snitzer
2018-05-21 14:52 ` Jens Axboe
2018-05-21 15:04 ` Mike Snitzer
2018-05-21 15:09 ` Jens Axboe
2018-05-21 15:18 ` Mike Snitzer
2018-05-21 15:36 ` Jens Axboe
2018-05-21 16:09 ` Mike Snitzer
2018-05-21 16:20 ` Jens Axboe
[not found] ` <20180530133629.GC5157@redhat.com>
2018-05-30 18:55 ` Jens Axboe
2018-05-30 19:34 ` Kent Overstreet
2018-05-30 19:36 ` Jens Axboe
2018-05-30 19:37 ` Mike Snitzer
2018-05-30 19:38 ` Jens Axboe
2018-05-21 17:37 ` Kent Overstreet
2018-05-21 18:24 ` Mike Snitzer
2018-05-21 23:38 ` Kent Overstreet
2018-05-22 6:41 ` Christoph Hellwig
2018-05-21 15:12 ` David Sterba
2018-05-21 15:18 ` Jens Axboe
2018-05-21 14:20 ` Jens Axboe
2018-05-30 22:24 ` Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180521183936.GJ23858@magnolia \
--to=darrick.wong@oracle.com \
--cc=axboe@kernel.dk \
--cc=bacik@fb.com \
--cc=clm@fb.com \
--cc=colyli@suse.de \
--cc=drbd-dev@lists.linbit.com \
--cc=hch@infradead.org \
--cc=kent.overstreet@gmail.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-raid@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=neilb@suse.com \
--cc=snitzer@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).