| Message ID | 20210126145247.1964410-14-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/17] zonefs: use bio_alloc in zonefs_file_dio_append | expand |
On Tue, Jan 26, 2021 at 7:17 AM Christoph Hellwig <hch@lst.de> wrote: > > md_bio_alloc_sync is never called with a NULL mddev, and ->sync_set is > initialized in md_run, so it always must be initialized as well. Just > open code the remaining call to bio_alloc_bioset. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Song Liu <song@kernel.org> > --- > drivers/md/md.c | 10 +--------- > 1 file changed, 1 insertion(+), 9 deletions(-) > > diff --git a/drivers/md/md.c b/drivers/md/md.c > index 6a27f52007c871..399c81bddc1ae1 100644 > --- a/drivers/md/md.c > +++ b/drivers/md/md.c > @@ -340,14 +340,6 @@ static int start_readonly; > */ > static bool create_on_open = true; > > -static struct bio *md_bio_alloc_sync(struct mddev *mddev) > -{ > - if (!mddev || !bioset_initialized(&mddev->sync_set)) > - return bio_alloc(GFP_NOIO, 1); > - > - return bio_alloc_bioset(GFP_NOIO, 1, &mddev->sync_set); > -} > - > /* > * We have a system wide 'event count' that is incremented > * on any 'interesting' event, and readers of /proc/mdstat > @@ -989,7 +981,7 @@ void md_super_write(struct mddev *mddev, struct md_rdev *rdev, > if (test_bit(Faulty, &rdev->flags)) > return; > > - bio = md_bio_alloc_sync(mddev); > + bio = bio_alloc_bioset(GFP_NOIO, 1, &mddev->sync_set); > > atomic_inc(&rdev->nr_pending); > > -- > 2.29.2 >
diff --git a/drivers/md/md.c b/drivers/md/md.c index 6a27f52007c871..399c81bddc1ae1 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -340,14 +340,6 @@ static int start_readonly; */ static bool create_on_open = true; -static struct bio *md_bio_alloc_sync(struct mddev *mddev) -{ - if (!mddev || !bioset_initialized(&mddev->sync_set)) - return bio_alloc(GFP_NOIO, 1); - - return bio_alloc_bioset(GFP_NOIO, 1, &mddev->sync_set); -} - /* * We have a system wide 'event count' that is incremented * on any 'interesting' event, and readers of /proc/mdstat @@ -989,7 +981,7 @@ void md_super_write(struct mddev *mddev, struct md_rdev *rdev, if (test_bit(Faulty, &rdev->flags)) return; - bio = md_bio_alloc_sync(mddev); + bio = bio_alloc_bioset(GFP_NOIO, 1, &mddev->sync_set); atomic_inc(&rdev->nr_pending);
md_bio_alloc_sync is never called with a NULL mddev, and ->sync_set is initialized in md_run, so it always must be initialized as well. Just open code the remaining call to bio_alloc_bioset. Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/md/md.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)