diff options
author | Kent Overstreet <koverstreet@google.com> | 2012-09-06 18:34:55 -0400 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2012-09-09 04:35:38 -0400 |
commit | 395c72a707d966b36d5a42fe12c3a237ded3a0d9 (patch) | |
tree | 79e4450a4f31409815d80ee8e1a7e1490a140f22 /drivers/md/md.c | |
parent | eeea3ac912207dcf759b95b2b4c36f96bce583bf (diff) |
block: Generalized bio pool freeing
With the old code, when you allocate a bio from a bio pool you have to
implement your own destructor that knows how to find the bio pool the
bio was originally allocated from.
This adds a new field to struct bio (bi_pool) and changes
bio_alloc_bioset() to use it. This makes various bio destructors
unnecessary, so they're then deleted.
v6: Explain the temporary if statement in bio_put
Signed-off-by: Kent Overstreet <koverstreet@google.com>
CC: Jens Axboe <axboe@kernel.dk>
CC: NeilBrown <neilb@suse.de>
CC: Alasdair Kergon <agk@redhat.com>
CC: Nicholas Bellinger <nab@linux-iscsi.org>
CC: Lars Ellenberg <lars.ellenberg@linbit.com>
Acked-by: Tejun Heo <tj@kernel.org>
Acked-by: Nicholas Bellinger <nab@linux-iscsi.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/md/md.c')
-rw-r--r-- | drivers/md/md.c | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 3f6203a4c7e..b8eebe357b2 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
@@ -155,32 +155,17 @@ static int start_readonly; | |||
155 | * like bio_clone, but with a local bio set | 155 | * like bio_clone, but with a local bio set |
156 | */ | 156 | */ |
157 | 157 | ||
158 | static void mddev_bio_destructor(struct bio *bio) | ||
159 | { | ||
160 | struct mddev *mddev, **mddevp; | ||
161 | |||
162 | mddevp = (void*)bio; | ||
163 | mddev = mddevp[-1]; | ||
164 | |||
165 | bio_free(bio, mddev->bio_set); | ||
166 | } | ||
167 | |||
168 | struct bio *bio_alloc_mddev(gfp_t gfp_mask, int nr_iovecs, | 158 | struct bio *bio_alloc_mddev(gfp_t gfp_mask, int nr_iovecs, |
169 | struct mddev *mddev) | 159 | struct mddev *mddev) |
170 | { | 160 | { |
171 | struct bio *b; | 161 | struct bio *b; |
172 | struct mddev **mddevp; | ||
173 | 162 | ||
174 | if (!mddev || !mddev->bio_set) | 163 | if (!mddev || !mddev->bio_set) |
175 | return bio_alloc(gfp_mask, nr_iovecs); | 164 | return bio_alloc(gfp_mask, nr_iovecs); |
176 | 165 | ||
177 | b = bio_alloc_bioset(gfp_mask, nr_iovecs, | 166 | b = bio_alloc_bioset(gfp_mask, nr_iovecs, mddev->bio_set); |
178 | mddev->bio_set); | ||
179 | if (!b) | 167 | if (!b) |
180 | return NULL; | 168 | return NULL; |
181 | mddevp = (void*)b; | ||
182 | mddevp[-1] = mddev; | ||
183 | b->bi_destructor = mddev_bio_destructor; | ||
184 | return b; | 169 | return b; |
185 | } | 170 | } |
186 | EXPORT_SYMBOL_GPL(bio_alloc_mddev); | 171 | EXPORT_SYMBOL_GPL(bio_alloc_mddev); |
@@ -189,18 +174,14 @@ struct bio *bio_clone_mddev(struct bio *bio, gfp_t gfp_mask, | |||
189 | struct mddev *mddev) | 174 | struct mddev *mddev) |
190 | { | 175 | { |
191 | struct bio *b; | 176 | struct bio *b; |
192 | struct mddev **mddevp; | ||
193 | 177 | ||
194 | if (!mddev || !mddev->bio_set) | 178 | if (!mddev || !mddev->bio_set) |
195 | return bio_clone(bio, gfp_mask); | 179 | return bio_clone(bio, gfp_mask); |
196 | 180 | ||
197 | b = bio_alloc_bioset(gfp_mask, bio->bi_max_vecs, | 181 | b = bio_alloc_bioset(gfp_mask, bio->bi_max_vecs, mddev->bio_set); |
198 | mddev->bio_set); | ||
199 | if (!b) | 182 | if (!b) |
200 | return NULL; | 183 | return NULL; |
201 | mddevp = (void*)b; | 184 | |
202 | mddevp[-1] = mddev; | ||
203 | b->bi_destructor = mddev_bio_destructor; | ||
204 | __bio_clone(b, bio); | 185 | __bio_clone(b, bio); |
205 | if (bio_integrity(bio)) { | 186 | if (bio_integrity(bio)) { |
206 | int ret; | 187 | int ret; |
@@ -5006,8 +4987,7 @@ int md_run(struct mddev *mddev) | |||
5006 | } | 4987 | } |
5007 | 4988 | ||
5008 | if (mddev->bio_set == NULL) | 4989 | if (mddev->bio_set == NULL) |
5009 | mddev->bio_set = bioset_create(BIO_POOL_SIZE, | 4990 | mddev->bio_set = bioset_create(BIO_POOL_SIZE, 0); |
5010 | sizeof(struct mddev *)); | ||
5011 | 4991 | ||
5012 | spin_lock(&pers_lock); | 4992 | spin_lock(&pers_lock); |
5013 | pers = find_pers(mddev->level, mddev->clevel); | 4993 | pers = find_pers(mddev->level, mddev->clevel); |