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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 33DC6C7618B for ; Tue, 23 Jul 2019 10:04:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 093B22239F for ; Tue, 23 Jul 2019 10:04:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563876269; bh=2EDClzhLHKF4BoafjH2haRsXA72foZVI+C0LjoKWoIg=; h=Subject:To:Cc:From:Date:List-ID:From; b=CNN3OyBsRH37boQFnijkl0iwynH4mQX0/1Wh9cjehyJoNHBSsEEo/Bxo+0hO/551I +fjAFy4HbbB24sT/z0DtuR4ymCTFxMfdLwHkEiZKAtTmbJmEFrtnzj5cFQrwMU1Hlv 4/6qtSOCqWt047QJfyoc7oeG7JxH4llIjHglhH8g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730083AbfGWKE2 (ORCPT ); Tue, 23 Jul 2019 06:04:28 -0400 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:58453 "EHLO wout2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729916AbfGWKE2 (ORCPT ); Tue, 23 Jul 2019 06:04:28 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 14AE1545; Tue, 23 Jul 2019 06:04:27 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Tue, 23 Jul 2019 06:04:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=ZDBJ9P P5oKy+UThcS2OtbStGTbqL0OvdGh1qw9CTHfk=; b=OZuvqJPdrb6Gq9bmKjg7RN dhyqsTFb99t0gZNXcBevphJ94enspyNPw2EjND2daCqxIcShE3/DpyL6askrZaWg HCzoPKR8Ac3QRRxd71fDT9S6xEYhfy0Gp+rEskXXuWJr5iMxGMYt4YFopGQyNQ59 YmgqAS6sj5SMI6mVCOBVtyo6AdB/ztqpdLErUIiGGfy3Fd55uo9whI6eZcxRt4Vk M7LYT2dDDA7UKwkScp8L33FsxbA4GWFWG5aD+HhxMLc7ZOrtDuuV/FZseF+z7+XQ AmzKwJXjaef1F684ZlWTa2NvpvZZq8oBdoIswzHVulDbYFwXekOZyN7i8ipyXsPw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddrjeekgddvfecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepuffvhfffkfggtgfgsehtkeertddttd flnecuhfhrohhmpeeoghhrvghgkhhhsehlihhnuhigfhhouhhnuggrthhiohhnrdhorhhg qeenucfkphepkeefrdekiedrkeelrddutdejnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hgrhgvgheskhhrohgrhhdrtghomhenucevlhhushhtvghrufhiiigvpedt X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id 3E3AB80059; Tue, 23 Jul 2019 06:04:25 -0400 (EDT) Subject: FAILED: patch "[PATCH] raid5-cache: Need to do start() part job after adding journal" failed to apply to 4.14-stable tree To: xni@redhat.com, axboe@kernel.dk, soltys@ziu.info, songliubraving@fb.com Cc: From: Date: Tue, 23 Jul 2019 12:04:23 +0200 Message-ID: <1563876263160153@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From d9771f5ec46c282d518b453c793635dbdc3a2a94 Mon Sep 17 00:00:00 2001 From: Xiao Ni Date: Fri, 14 Jun 2019 15:41:05 -0700 Subject: [PATCH] raid5-cache: Need to do start() part job after adding journal device 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 diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index b83bce2beb66..da94cbaa1a9e 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -7672,7 +7672,7 @@ static int raid5_remove_disk(struct mddev *mddev, struct md_rdev *rdev) 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; @@ -7687,7 +7687,14 @@ static int raid5_add_disk(struct mddev *mddev, struct md_rdev *rdev) * 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)