summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Hansen <devtimhansen@gmail.com>2017-10-06 14:45:13 -0400
committerJens Axboe <axboe@kernel.dk>2017-10-06 13:03:14 -0600
commit4078def82f352cf5007691635da290a109511bc5 (patch)
treec246c05286693c2fd06528a59ffe883e06b2706e
parent4b14a5c5d57f4fd6929db3427ba4d7c3775b4680 (diff)
block/bio: Remove null checks before mempool_destroy in bioset_free
This patch removes redundant checks for null values on bio_pool and bvec_pool. Found using make coccicheck M=block/ on linux-net tree on the next-20170929 tag. Signed-off-by: Tim Hansen <devtimhansen@gmail.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--block/bio.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/block/bio.c b/block/bio.c
index 8338304ea256..bf0dbe8f78f8 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -1928,11 +1928,8 @@ void bioset_free(struct bio_set *bs)
if (bs->rescue_workqueue)
destroy_workqueue(bs->rescue_workqueue);
- if (bs->bio_pool)
- mempool_destroy(bs->bio_pool);
-
- if (bs->bvec_pool)
- mempool_destroy(bs->bvec_pool);
+ mempool_destroy(bs->bio_pool);
+ mempool_destroy(bs->bvec_pool);
bioset_integrity_free(bs);
bio_put_slab(bs);