All of lore.kernel.org
 help / color / mirror / Atom feed
From: Su Yue <suy.fnst@cn.fujitsu.com>
To: <linux-btrfs@vger.kernel.org>
Cc: <suy.fnst@cn.fujitsu.com>, <dsterba@suse.cz>
Subject: [PATCH v5 14/16] btrfs-progs: lowmem: introduce repair_block_accounting()
Date: Tue, 8 May 2018 16:30:10 +0800	[thread overview]
Message-ID: <20180508083012.12090-15-suy.fnst@cn.fujitsu.com> (raw)
In-Reply-To: <20180508083012.12090-1-suy.fnst@cn.fujitsu.com>

Introduce repair_block_accounting() which calls
btrfs_fix_block_accounting() to repair block group accouting.

Replace btrfs_fix_block_accounting() with the new function.

Note: This patch and next patches cause error in lowmem repair like:
"Error: Commit_root already set when starting transaction".
Such error will disappear after removing @trans finished.

Signed-off-by: Su Yue <suy.fnst@cn.fujitsu.com>
---
 check/mode-lowmem.c | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/check/mode-lowmem.c b/check/mode-lowmem.c
index babbe60fd92c..3e81fc16e564 100644
--- a/check/mode-lowmem.c
+++ b/check/mode-lowmem.c
@@ -537,6 +537,30 @@ static int end_avoid_extents_overwrite(struct btrfs_fs_info *fs_info)
 	return ret;
 }
 
+/*
+ * Wrapper function for btrfs_fix_block_accounting().
+ *
+ * Returns 0     on success.
+ * Returns != 0  on error.
+ */
+static int repair_block_accounting(struct btrfs_fs_info *fs_info)
+{
+	struct btrfs_trans_handle *trans = NULL;
+	struct btrfs_root *root = fs_info->extent_root;
+	int ret;
+
+	trans = btrfs_start_transaction(root, 1);
+	if (IS_ERR(trans)) {
+		ret = PTR_ERR(trans);
+		error("fail to start transaction %s", strerror(-ret));
+		return ret;
+	}
+
+	ret = btrfs_fix_block_accounting(trans, root);
+	btrfs_commit_transaction(trans, root);
+	return ret;
+}
+
 /*
  * This function only handles BACKREF_MISSING,
  * If corresponding extent item exists, increase the ref, else insert an extent
@@ -4991,7 +5015,7 @@ out:
 
 		reset_cached_block_groups(fs_info);
 		/* update block accounting */
-		ret = btrfs_fix_block_accounting(trans, root);
+		ret = repair_block_accounting(fs_info);
 		if (ret)
 			err |= ret;
 		else
-- 
2.17.0




  parent reply	other threads:[~2018-05-08  8:24 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-08  8:29 [PATCH v5 00/16] btrfs-progs: lowmem: avoid extents overwrite Su Yue
2018-05-08  8:29 ` [PATCH v5 01/16] btrfs-progs: check: move pin_down_tree_blocks to mode-common.c Su Yue
2018-05-08  8:29 ` [PATCH v5 02/16] btrfs-progs: lowmem: exclude extents of metadata blocks Su Yue
2018-05-08  8:29 ` [PATCH v5 03/16] btrfs-progs: lowmem: introduce mark/clear_block_groups_full() Su Yue
2018-05-08  8:30 ` [PATCH v5 04/16] btrfs-progs: lowmem: introduce try_force_cow_in_new_chunk() Su Yue
2018-05-08  8:30 ` [PATCH v5 05/16] btrfs-progs: lowmem: introduce avoid_extents_overwrite() Su Yue
2018-05-08  8:30 ` [PATCH v5 06/16] btrfs-progs: lowmem: exclude extents if init-extent-tree in lowmem Su Yue
2018-05-08  8:30 ` [PATCH v5 07/16] btrfs-progs: lowmem: start to remove parameters @trans " Su Yue
2018-05-08  8:30 ` [PATCH v5 08/16] btrfs-progs: lowmem: remove parameter @trans of delete_extent_item() Su Yue
2018-05-08  8:30 ` [PATCH v5 09/16] btrfs-progs: lowmem: remove parameter @trans of repair_chunk_item() Su Yue
2018-05-08  8:30 ` [PATCH v5 10/16] btrfs-progs: lowmem: remove parameter @trans of repair_extent_item() Su Yue
2018-05-08  8:30 ` [PATCH v5 11/16] btrfs-progs: lowmem: remove parameter @trans of check_leaf_items() Su Yue
2018-05-08  8:30 ` [PATCH v5 12/16] btrfs-progs: lowmem: remove parameter @trans of repair_tree_back_ref() Su Yue
2018-05-08  8:30 ` [PATCH v5 13/16] btrfs-progs: lowmem: remove parameter @trans of check_btrfs_root() Su Yue
2018-05-08  8:30 ` Su Yue [this message]
2018-05-08  8:30 ` [PATCH v5 15/16] btrfs-progs: lowmem: end of removing parameters @trans in lowmem Su Yue
2018-05-08  8:30 ` [PATCH v5 16/16] btrfs-progs: fsck-tests: add image no extent with normal device size Su Yue
2018-05-08 17:11 ` [PATCH v5 00/16] btrfs-progs: lowmem: avoid extents overwrite David Sterba

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180508083012.12090-15-suy.fnst@cn.fujitsu.com \
    --to=suy.fnst@cn.fujitsu.com \
    --cc=dsterba@suse.cz \
    --cc=linux-btrfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.