From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.6 required=3.0 tests=DATE_IN_PAST_06_12, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E86CC7618B for ; Thu, 25 Jul 2019 05:49:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D8E5D2075C for ; Thu, 25 Jul 2019 05:49:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564033789; bh=11E7e5E99LqGGNJmqynG3uIbu/ENqOYwEjK/1K0oJ5o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=CNQzXNz0cLCpK7+pS6NsOiaTAjEdmw/vpPSb9n7uOErItqs1QvD3yDjIpgW7/B5Ab bfw891Z55amgWUjxEsaEp7uGP50ndEs8vLUggbMTJHuwjhYPVR1tuqaswoU3EXqVj1 o6aALss7jfyQVEVmHvON5rZaN0hG1OfhLy6XJTto= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391117AbfGYFny (ORCPT ); Thu, 25 Jul 2019 01:43:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:58906 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391107AbfGYFnx (ORCPT ); Thu, 25 Jul 2019 01:43:53 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5EB9721850; Thu, 25 Jul 2019 05:43:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564033432; bh=11E7e5E99LqGGNJmqynG3uIbu/ENqOYwEjK/1K0oJ5o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gTPlkx9lzcGxH1FrR7FnT62phLq0m5q1wLlUr7zL3juua4YdFtA69T17ldIFFhy0r 8m7vYiBd6du9A4Ma4yx6vt/BLNAJjsPx4/pJGbve1kL5PYCBHck+EPxUQgR4RZI7x1 aK3o0lVpbYVv3ymApxqGrsv4jDTCM9OFbS5wWf9I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Michal Soltys , Xiao Ni , Song Liu , Jens Axboe Subject: [PATCH 4.19 205/271] raid5-cache: Need to do start() part job after adding journal device Date: Wed, 24 Jul 2019 21:21:14 +0200 Message-Id: <20190724191712.656388776@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191655.268628197@linuxfoundation.org> References: <20190724191655.268628197@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Xiao Ni commit d9771f5ec46c282d518b453c793635dbdc3a2a94 upstream. commit d5d885fd514f ("md: introduce new personality funciton start()") splits the init job to two parts. The first part run() does the jobs that do not require the md threads. The second part start() does the jobs that require the md threads. Now it just does run() in adding new journal device. It needs to do the second part start() too. Fixes: d5d885fd514f ("md: introduce new personality funciton start()") Cc: stable@vger.kernel.org #v4.9+ Reported-by: Michal Soltys Signed-off-by: Xiao Ni Signed-off-by: Song Liu Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- drivers/md/raid5.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -7670,7 +7670,7 @@ abort: static int raid5_add_disk(struct mddev *mddev, struct md_rdev *rdev) { struct r5conf *conf = mddev->private; - int err = -EEXIST; + int ret, err = -EEXIST; int disk; struct disk_info *p; int first = 0; @@ -7685,7 +7685,14 @@ static int raid5_add_disk(struct mddev * * The array is in readonly mode if journal is missing, so no * write requests running. We should be safe */ - log_init(conf, rdev, false); + ret = log_init(conf, rdev, false); + if (ret) + return ret; + + ret = r5l_start(conf->log); + if (ret) + return ret; + return 0; } if (mddev->recovery_disabled == conf->recovery_disabled)