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=-10.6 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 BE02EC43387 for ; Mon, 7 Jan 2019 13:23:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 864A221736 for ; Mon, 7 Jan 2019 13:23:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1546867401; bh=PtGGjp31A5LZ9PWN45SmmdAqwg7/CpEIsAMv6sHIulA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ncMukoNAyemlh8Ex4Yw8TgSqCRLPqODQOXPfGYcKHZUu5CC+6jxXReVcayBG1Fzen pnUYLBwXXYFaUDRubvCGpX3V9yzSuuxWw5H/ycCmLTg2raNOR9GKgenWvA67kf8R8s KBVg3T1J6qXS52qZkzshhD+3FR6lJWlAG5WItuVU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727511AbfAGNXP (ORCPT ); Mon, 7 Jan 2019 08:23:15 -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: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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; }