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=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_NEOMUTT 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 11F33C282CD for ; Mon, 28 Jan 2019 22:24:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D25E221738 for ; Mon, 28 Jan 2019 22:24:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ogLcp55T" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726735AbfA1WYc (ORCPT ); Mon, 28 Jan 2019 17:24:32 -0500 Received: from mail-wm1-f48.google.com ([209.85.128.48]:36412 "EHLO mail-wm1-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726713AbfA1WYc (ORCPT ); Mon, 28 Jan 2019 17:24:32 -0500 Received: by mail-wm1-f48.google.com with SMTP id p6so15651126wmc.1 for ; Mon, 28 Jan 2019 14:24:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=y7/TOGgPhLuiABNGzP5NCuLUKTVil2ufXB2Qm23KgCo=; b=ogLcp55TT32xTVVry0ZlkyD6cQRslvwgOHioOLi7MFpPKQYgpP+1jJr+aGEFIgs0iX W0bkRmU2UlFGn3YSrghyWNun3zRPGqzDUcQ46PrS4Z0J8e9zJ96zju+og8BXug/Viulr hqthkTHF+w3s59h7T5lfaA0ReKAiiJ0OCRVDmdNxwAfxzfb8Q7+OsM1AHlk0mSp+S3mD vkgrtBb8uzl7ryYSEnLrQ/i8M4WtQmbiRHDp6KDBtPWwMi7cW1obezb+iBvc9H+fj73E okXueh/9/LOGbJFbLJ04PtRPQuCpqJgYqABVoZ2UfsrIRG26uUplT1qc8Ps67xo/5Sqx nxFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=y7/TOGgPhLuiABNGzP5NCuLUKTVil2ufXB2Qm23KgCo=; b=s3pjsJw1rd2b6jnRTnBa7CIka9BduZiSIPYuGEt33+uScQ2imDpt5TgIt0QxiQme9E htTMWlDbOLgeCc3bFSmfcC8eysRBkGCJZKSONkbFnTNFsrHv6ddJZp5z665To/BK4oph tHnEk7YQ6oONw+tAvdsgeuwVixU/v8kTmUlCTBWnPE3dL5FcXsgomFx5/UHKLvvZXiJu sP635kKoRuOZBDdqBcI3vxtIt8nTwvs0Txqhc2t6Dp7MiN+snnU9uvPcc0BEMToluFSB prHHfGOCAK/1PiMJXq0uFj9jEQ3MNr7i32RISCl/DABNrki85Ydk0Q4PHX5fNL/AzYXv KSEQ== X-Gm-Message-State: AJcUukcy69vodPGpd0eoK9QCWC7JrX3iNZ3GzaXefHMgT5qXk2A31uJ6 L5mfZ7kAhk6H7v684dxWyF7dtXbz X-Google-Smtp-Source: ALg8bN7EYQw/TehXNQh1P9YQucvr/QE7/+US6Tl+sdqSyQqmxbZVYP9FSg+fYSSWgeqdB4Fo0APwBQ== X-Received: by 2002:a7b:c142:: with SMTP id z2mr19629078wmi.102.1548714270158; Mon, 28 Jan 2019 14:24:30 -0800 (PST) Received: from debian (cpc101300-bagu16-2-0-cust362.1-3.cable.virginm.net. [86.21.41.107]) by smtp.gmail.com with ESMTPSA id w18sm114379341wru.54.2019.01.28.14.24.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 28 Jan 2019 14:24:29 -0800 (PST) Date: Mon, 28 Jan 2019 22:24:27 +0000 From: Sudip Mukherjee To: gregkh@linuxfoundation.org Cc: anand.jain@oracle.com, dsterba@suse.com, stable@vger.kernel.org Subject: Re: FAILED: patch "[PATCH] btrfs: dev-replace: go back to suspended state if target" failed to apply to 4.14-stable tree Message-ID: <20190128222427.7a2pscag2genf2y2@debian> References: <154670844210567@kroah.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="yj6ttmlzj3xdso5f" Content-Disposition: inline In-Reply-To: <154670844210567@kroah.com> User-Agent: NeoMutt/20170113 (1.7.2) Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org --yj6ttmlzj3xdso5f Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi Greg, On Sat, Jan 05, 2019 at 06:14:02PM +0100, gregkh@linuxfoundation.org wrote: > > 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 . The attached backported patch should now apply to 4.14-stable tree. -- Regards Sudip --yj6ttmlzj3xdso5f Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0001-btrfs-dev-replace-go-back-to-suspended-state-if-targ.patch" >From f36e6a70aa0fb80b4fc971324437b76d29e19c1c Mon Sep 17 00:00:00 2001 From: Anand Jain Date: Sun, 11 Nov 2018 22:22:17 +0800 Subject: [PATCH] btrfs: dev-replace: go back to suspended state if target device is missing commit 0d228ece59a35a9b9e8ff0d40653234a6d90f61e upstream At the time of forced unmount we place the running replace to BTRFS_IOCTL_DEV_REPLACE_STATE_SUSPENDED state, so when the system comes back and expect the target device is missing. Then let the replace state continue to be in BTRFS_IOCTL_DEV_REPLACE_STATE_SUSPENDED state instead of BTRFS_IOCTL_DEV_REPLACE_STATE_STARTED as there isn't any matching scrub running as part of replace. Fixes: e93c89c1aaaa ("Btrfs: add new sources for device replace code") CC: stable@vger.kernel.org # 4.4+ Signed-off-by: Anand Jain Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Sudip Mukherjee --- fs/btrfs/dev-replace.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c index 68362eddaea2..f86457713e60 100644 --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c @@ -804,6 +804,8 @@ int btrfs_resume_dev_replace_async(struct btrfs_fs_info *fs_info) "cannot continue dev_replace, tgtdev is missing"); btrfs_info(fs_info, "you may cancel the operation after 'mount -o degraded'"); + dev_replace->replace_state = + BTRFS_IOCTL_DEV_REPLACE_STATE_SUSPENDED; btrfs_dev_replace_unlock(dev_replace, 1); return 0; } -- 2.11.0 --yj6ttmlzj3xdso5f--