Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934775AbcCPIgW (ORCPT ); Wed, 16 Mar 2016 04:36:22 -0400 Received: from mail.kernel.org ([198.145.29.136]:59551 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966153AbcCPIJG (ORCPT ); Wed, 16 Mar 2016 04:09:06 -0400 From: lizf@kernel.org To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, NeilBrown , Zefan Li Subject: [PATCH 3.4 034/107] md: make sure everything is freed when dm-raid stops an array. Date: Wed, 16 Mar 2016 16:05:28 +0800 Message-Id: <1458115601-5762-34-git-send-email-lizf@kernel.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1458115541-5712-1-git-send-email-lizf@kernel.org> References: <1458115541-5712-1-git-send-email-lizf@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1831 Lines: 66 From: NeilBrown 3.4.111-rc1 review patch. If anyone has any objections, please let me know. ------------------ commit 5eff3c439d3478ba9e8ba5f8c0aaf6e6fadb6e58 upstream. md_stop() would stop an array, but not free various attached data structures. For internal arrays, these are freed later in do_md_stop() or mddev_put(), but they don't apply for dm-raid arrays. So get md_stop() to free them, and only all it from dm-raid. For internal arrays we now call __md_stop. Reported-by: majianpeng Signed-off-by: NeilBrown Signed-off-by: Zefan Li --- drivers/md/md.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index 83dba06..25f0cb5 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -5120,7 +5120,7 @@ void md_stop_writes(struct mddev *mddev) } EXPORT_SYMBOL_GPL(md_stop_writes); -void md_stop(struct mddev *mddev) +static void __md_stop(struct mddev *mddev) { mddev->ready = 0; mddev->pers->stop(mddev); @@ -5130,6 +5130,18 @@ void md_stop(struct mddev *mddev) mddev->pers = NULL; clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery); } + +void md_stop(struct mddev *mddev) +{ + /* stop the array and free an attached data structures. + * This is called from dm-raid + */ + __md_stop(mddev); + bitmap_destroy(mddev); + if (mddev->bio_set) + bioset_free(mddev->bio_set); +} + EXPORT_SYMBOL_GPL(md_stop); static int md_set_readonly(struct mddev *mddev, struct block_device *bdev) @@ -5190,7 +5202,7 @@ static int do_md_stop(struct mddev * mddev, int mode, set_disk_ro(disk, 0); __md_stop_writes(mddev); - md_stop(mddev); + __md_stop(mddev); mddev->queue->merge_bvec_fn = NULL; mddev->queue->backing_dev_info.congested_fn = NULL; -- 1.9.1