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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 A0164C282D0 for ; Tue, 29 Jan 2019 11:55:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6CB802083B for ; Tue, 29 Jan 2019 11:55:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548762929; bh=qUeY3TLOD1nhZHflAkqzhX5VzFKQqFHmTs+Wvc4bol4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=jJu4WNOJvVp5JKz+zecF80QMDXuGcAl5sF1s6gRvDfvffwh7Q0u82deEUdhFaHBi8 FBgLMyO0gZ236bRHncA4fK4DQVghmR7XKkiDBsYaio1HccovPwbMfb2wTiv7zRC/Cs lcJnMsdsFJ6pwbNYCbMUq5zvOMTNz+mUH+Jf1awE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731723AbfA2Luq (ORCPT ); Tue, 29 Jan 2019 06:50:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:42086 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730992AbfA2Lum (ORCPT ); Tue, 29 Jan 2019 06:50:42 -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 8B92120882; Tue, 29 Jan 2019 11:50:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548762642; bh=qUeY3TLOD1nhZHflAkqzhX5VzFKQqFHmTs+Wvc4bol4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o1s8oWmD4QXTC7nCPgmlPByCNxuvK/RlLkWJRz22VpJH80FdEmDZdjrvPCzuxS5GC P8k10hUBkLi6rGTd2BBCKrR2LiiW3C9MJRG7lRIO4nYLJZo1aM8S8r2YJ5OFIslA4Y Tecg+Ot54Yc+L1Xol4HSzxAPwtMh8doFDz5HUgWo= 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.14 68/68] btrfs: dev-replace: go back to suspended state if target device is missing Date: Tue, 29 Jan 2019 12:36:30 +0100 Message-Id: <20190129113138.407120647@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190129113131.751891514@linuxfoundation.org> References: <20190129113131.751891514@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.14-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 @@ -804,6 +804,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; }