Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp4564433imu; Tue, 29 Jan 2019 03:54:04 -0800 (PST) X-Google-Smtp-Source: ALg8bN4NLEsi97nDMYt0g8dbbLGyvGAAXXLPTYk0P+Z6sF5q5PRIRnMbOCP9QVCFDUX6iQ3Bk/WV X-Received: by 2002:a17:902:b112:: with SMTP id q18mr25768738plr.255.1548762844269; Tue, 29 Jan 2019 03:54:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548762844; cv=none; d=google.com; s=arc-20160816; b=UAypLsMGbx19ytEy24lNTHwRrOM+Z/md0HFbSEOUfCA015ZwW43iIzrNqT09wQQQP9 qzcvxq+MCS/XvzKCTPRcK24jdovc699++GT79A7es42Wl2cSJfXLjl1CzKMhRTX/rQVS WKReKi3jGRNuMR42PMFUbOi33xMpT8IASC6W/VPbftmcR7jdNZ+Ahe5m9C3NEYPAXR8T pvf9x35SKXb37GyAzjjKVfrMX6UdIcsuIFjTeipQT9SbTHq2F6P0u96ao/GkmUSLOXuN CQ3O+iGiad3vqn7NglpIiU++nZhSO7FQBe52znrcJxKB69JlTT55AW0HHrRFtqVgcdht 2ZXw== 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=n6xCsTUBn9kayCJST/GcmhzTskkfVt1MMKXEa+aCcO0=; b=gY9IHb64Y+8Mmidj8wJy4zXa/VVHuhBI4t6pOaIbc54plloTn7PlvjdBgA4DtS96NQ dHCDo1AD19jZad5q15tsGZQwiD6d05lu0fPKXLFf7qd6QbMXSqyUdM6TE3DJuibcs3E0 BssXf1ZlcR01jr7guwhN4OAK0eqeRmdnSaIEXKdVDGiTDf2FyiFGQLKPGXHqlLaxwD3u SiOkeN57m6Us/Li8ImzUjxPr9LycopU4jpwoDoyeSy4LaNj7MZfPKkc7Kn9H6lrizGN2 2Cd/HnKzA8izjTXUaz8YUfSf0yy7twCCMWltWjIecZlo6Y8YIJo1M/zWBe3gjkbj9W5Z +8Dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=YWzYeFsy; 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 s36si3686405pld.46.2019.01.29.03.53.48; Tue, 29 Jan 2019 03:54:04 -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=YWzYeFsy; 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 S1732108AbfA2Lwb (ORCPT + 99 others); Tue, 29 Jan 2019 06:52:31 -0500 Received: from mail.kernel.org ([198.145.29.99]:44282 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729750AbfA2Lw1 (ORCPT ); Tue, 29 Jan 2019 06:52:27 -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 728C120882; Tue, 29 Jan 2019 11:52:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548762747; bh=ZkGroI5MD2nsDXYDZmaTPRxsiCD/73NJ7sHkL4Npcq8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YWzYeFsy9a/1alZSQcLYGpql/9o7HBfDHKwecE4K3TVPSp64E2RI5WH/z0scSS7K3 SLL7mc72RZdvV+TNdv9vLGAI5TXaSiJBEzbaPubYKhAN+mfhyhJVrktDHrP6+aN4dN ru2sHuifTH49y4Z0LF4s8VffUU0K1Ri+/T4vbu7k= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Anand Jain , David Sterba , Sudip Mukherjee Subject: [PATCH 4.9 44/44] btrfs: dev-replace: go back to suspended state if target device is missing Date: Tue, 29 Jan 2019 12:36:39 +0100 Message-Id: <20190129113143.540292866@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190129113139.826927690@linuxfoundation.org> References: <20190129113139.826927690@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.9-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: Sudip Mukherjee 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 @@ -787,6 +787,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_unlock(dev_replace, 1); return 0; }