diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-11-21 12:04:15 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-11-21 12:04:15 +1100 |
| commit | 28ce3338fd9910e06d9d7578ce8c01eebc6cf2cd (patch) | |
| tree | a32fcc01b726a12043f4b9865e925cbf1c765064 /drivers | |
| parent | c4ac0c5653609dc4a798def26a26331f3c9006e3 (diff) | |
| parent | cac09f066f0f2e8bda0d6a05a7ef727beb81cba7 (diff) | |
Merge remote-tracking branch 'md/for-next'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/md/md.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index fc488cb30a94..4f9b5827355e 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -2148,14 +2148,12 @@ EXPORT_SYMBOL(md_integrity_register); */ int md_integrity_add_rdev(struct md_rdev *rdev, struct mddev *mddev) { - struct blk_integrity *bi_rdev; struct blk_integrity *bi_mddev; char name[BDEVNAME_SIZE]; if (!mddev->gendisk) return 0; - bi_rdev = bdev_get_integrity(rdev->bdev); bi_mddev = blk_get_integrity(mddev->gendisk); if (!bi_mddev) /* nothing to do */ @@ -5694,14 +5692,10 @@ int md_run(struct mddev *mddev) return 0; abort: - if (mddev->flush_bio_pool) { - mempool_destroy(mddev->flush_bio_pool); - mddev->flush_bio_pool = NULL; - } - if (mddev->flush_pool){ - mempool_destroy(mddev->flush_pool); - mddev->flush_pool = NULL; - } + mempool_destroy(mddev->flush_bio_pool); + mddev->flush_bio_pool = NULL; + mempool_destroy(mddev->flush_pool); + mddev->flush_pool = NULL; return err; } |