From patchwork Fri Feb 2 08:27:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lu Fengqi X-Patchwork-Id: 10196367 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 29FF160362 for ; Fri, 2 Feb 2018 08:28:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 14C7A28BF2 for ; Fri, 2 Feb 2018 08:28:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0850A28E0F; Fri, 2 Feb 2018 08:28:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7E43B28BF2 for ; Fri, 2 Feb 2018 08:28:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751836AbeBBI2E (ORCPT ); Fri, 2 Feb 2018 03:28:04 -0500 Received: from mail.cn.fujitsu.com ([183.91.158.132]:33627 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751795AbeBBI2D (ORCPT ); Fri, 2 Feb 2018 03:28:03 -0500 X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="36672980" Received: from bogon (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 02 Feb 2018 16:28:01 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (unknown [10.167.33.80]) by cn.fujitsu.com (Postfix) with ESMTP id 4872349F19C5 for ; Fri, 2 Feb 2018 16:28:03 +0800 (CST) Received: from localhost.localdomain (10.167.226.155) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.361.1; Fri, 2 Feb 2018 16:28:01 +0800 From: Lu Fengqi To: Subject: [PATCH 05/10] btrfs-progs: undelete-subvol: introduce recover_dead_root Date: Fri, 2 Feb 2018 16:27:46 +0800 Message-ID: <20180202082751.26225-6-lufq.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180202082751.26225-1-lufq.fnst@cn.fujitsu.com> References: <20180202082751.26225-1-lufq.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.155] X-yoursite-MailScanner-ID: 4872349F19C5.A98B1 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: lufq.fnst@cn.fujitsu.com Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The function will find the root_item specified by the subvol_id, clear the BTRFS_ROOT_SUBVOL_DEAD flag and set root_refs to one. Signed-off-by: Lu Fengqi --- ctree.h | 1 + undelete-subvol.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/ctree.h b/ctree.h index 18f7c79ddeec..3df062cc7c25 100644 --- a/ctree.h +++ b/ctree.h @@ -185,6 +185,7 @@ static int btrfs_csum_sizes[] = { 4 }; #define BTRFS_FT_MAX 9 #define BTRFS_ROOT_SUBVOL_RDONLY (1ULL << 0) +#define BTRFS_ROOT_SUBVOL_DEAD (1ULL << 48) /* * the key defines the order in the tree, and so it also defines (optimal) diff --git a/undelete-subvol.c b/undelete-subvol.c index 00fcc4895778..781057df2b84 100644 --- a/undelete-subvol.c +++ b/undelete-subvol.c @@ -12,6 +12,9 @@ */ #include "ctree.h" +#include "transaction.h" +#include "disk-io.h" +#include "messages.h" /* * Determines whether the subvolume is intact, according to the drop_progress @@ -51,3 +54,55 @@ out: btrfs_release_path(&path); return ret; } + +/* + * Clear BTRFS_ROOT_SUBVOL_DEAD flag and set the root_refs to one. + * + * @root the root of root tree. + * @subvol_id specify the root_item which will be modified. + * + * Return 0 if no error occurred. + */ +static int recover_dead_root(struct btrfs_trans_handle *trans, + struct btrfs_root *root, u64 subvol_id) +{ + struct btrfs_key key; + struct btrfs_path path; + struct extent_buffer *leaf; + struct btrfs_root_item root_item; + u64 root_flags; + u64 offset; + int ret; + + key.objectid = subvol_id; + key.type = BTRFS_ROOT_ITEM_KEY; + key.offset = 0; + + btrfs_init_path(&path); + ret = btrfs_search_slot(trans, root, &key, &path, 0, 0); + if (ret) { + error("couldn't find ROOT_ITEM for %llu failed: %d", + subvol_id, ret); + goto out; + } + + leaf = path.nodes[0]; + + offset = btrfs_item_ptr_offset(leaf, path.slots[0]); + read_extent_buffer(leaf, &root_item, offset, sizeof(root_item)); + + /* Clear BTRFS_ROOT_SUBVOL_DEAD */ + root_flags = btrfs_root_flags(&root_item); + btrfs_set_root_flags(&root_item, + root_flags & ~BTRFS_ROOT_SUBVOL_DEAD); + + /* Increase the refs */ + btrfs_set_root_refs(&root_item, 1); + + write_extent_buffer(leaf, &root_item, offset, sizeof(root_item)); + btrfs_mark_buffer_dirty(leaf); + +out: + btrfs_release_path(&path); + return ret; +}