Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp3733909imu; Mon, 7 Jan 2019 08:30:12 -0800 (PST) X-Google-Smtp-Source: ALg8bN6SlQvBZfXNLcT7LPyzpCNq5Wuz146Xlsdv7pggWMYupe3D5n9F6pdPUcj0vDNlA9jfL1ic X-Received: by 2002:a63:83c1:: with SMTP id h184mr11413064pge.437.1546878612914; Mon, 07 Jan 2019 08:30:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546878612; cv=none; d=google.com; s=arc-20160816; b=HKb76WT+qGRlvAegsBojG9ze2Mi0+FtqVZT5wcO/fYqoTbqCPi3dSV6LAafeoc80Z7 7UUqclZUJJ4554L+nZhFxHWxrASjks81KTGvwHy+FAdEffRw8uT7FojIEMimoYAS0Wph ed68Jjvz7HQtgkJUp+PAs7jcCvFAceRPHEBNFI8xRnXEseWr2Z15tpbBbWpx+m+5IOUO PzQQtul+lwnYLUVen2auyOy9YzUhqUqmsJo6MAulNw9HOcQrZ1XSVXkzYNixBfa0liLe CXgEWdc7hCerVJl76g/cXmqhwscYFhG29dWTgX98F8oYm9CQ77hubieU+oyTYy8zqJ83 kWzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=M8YZ1+he0ApE3RDDNlK71bsc0VVzJbi8hzjBDhdDH7Q=; b=TcZFffXmFbbIGTqOFaGxiK4eXR0d5sjUmNo1FkDW1QSHzlDykMv+nSMgduHRqm8ohW Wiu3tIcMrgo2wDRLsh3oiwuDg0ArNQ3Y33NgWA7xV7F6usDDsDKqqQ4FzklsQ3J8IpbP xuTF/YqCHyWaXymsqCK5TsEm8Ft4AhAdbE93KZj7/gq1yZB8kuzjK+a+JZGaPtjQaZvh H/ViW6NZ5SnFzNQ0QHoH20ffMolzCvYm/yEHVrOgFwGp3eX7TnmBZFILsdC9TIYYGfL8 JxlpZBZBuHF963ufE7p/3lvg32Ibtr0TBIGT85j43FUE+bEWSU/qCa+JGQ3BvvN1Ku+C 5tKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=OvjyM+Ih; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n67si63838725pfk.34.2019.01.07.08.29.57; Mon, 07 Jan 2019 08:30:12 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=OvjyM+Ih; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728617AbfAGNXQ (ORCPT + 99 others); Mon, 7 Jan 2019 08:23:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:57340 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726879AbfAGMlw (ORCPT ); Mon, 7 Jan 2019 07:41:52 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 F31022183E; Mon, 7 Jan 2019 12:41:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1546864911; bh=PtGGjp31A5LZ9PWN45SmmdAqwg7/CpEIsAMv6sHIulA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OvjyM+Ihyfkk37HmtEon9oGpImf17GgS65tDHLoBKFO3Arv39ZplAUlE3dTVH0Aog k1gdMHHPeIaurGSymaligjoRi9fJiBFGknf3uH2Eq4Lzj9KiQJ3LAF1Ee7EZWRc7ff rh43hMnhYQZEYo8Uhy5n6lnpKttiTHcfO14nu1hs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Anand Jain , David Sterba Subject: [PATCH 4.20 092/145] btrfs: dev-replace: go back to suspended state if target device is missing Date: Mon, 7 Jan 2019 13:32:09 +0100 Message-Id: <20190107104449.252485612@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190107104437.308206189@linuxfoundation.org> References: <20190107104437.308206189@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ From: Anand Jain 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: Greg Kroah-Hartman --- fs/btrfs/dev-replace.c | 2 ++ 1 file changed, 2 insertions(+) --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c @@ -884,6 +884,8 @@ int btrfs_resume_dev_replace_async(struc "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_write_unlock(dev_replace); return 0; }