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 10/16] btrfs-progs: lowmem: remove parameter @trans of repair_extent_item()
Date: Tue, 8 May 2018 16:30:06 +0800	[thread overview]
Message-ID: <20180508083012.12090-11-suy.fnst@cn.fujitsu.com> (raw)
In-Reply-To: <20180508083012.12090-1-suy.fnst@cn.fujitsu.com>

This patch removes parameter @trans of repair_extent_item().
It calls try_avoid_extents_overwrite() and starts a transaction by
itself.

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 | 54 ++++++++++++++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 20 deletions(-)

diff --git a/check/mode-lowmem.c b/check/mode-lowmem.c
index 0f4f0499f7c8..0e3bca76d901 100644
--- a/check/mode-lowmem.c
+++ b/check/mode-lowmem.c
@@ -3649,40 +3649,55 @@ out:
  *               means error after repair
  * Returns  0   nothing happened
  */
-static int repair_extent_item(struct btrfs_trans_handle *trans,
-		      struct btrfs_root *root, struct btrfs_path *path,
+static int repair_extent_item(struct btrfs_root *root, struct btrfs_path *path,
 		      u64 bytenr, u64 num_bytes, u64 parent, u64 root_objectid,
 		      u64 owner, u64 offset, int err)
 {
+	struct btrfs_trans_handle *trans;
+	struct btrfs_root *extent_root = root->fs_info->extent_root;
 	struct btrfs_key old_key;
 	int freed = 0;
 	int ret;
 
 	btrfs_item_key_to_cpu(path->nodes[0], &old_key, path->slots[0]);
 
-	if (err & (REFERENCER_MISSING | REFERENCER_MISMATCH)) {
-		/* delete the backref */
-		ret = btrfs_free_extent(trans, root->fs_info->fs_root, bytenr,
-			  num_bytes, parent, root_objectid, owner, offset);
-		if (!ret) {
-			freed = 1;
-			err &= ~REFERENCER_MISSING;
-			printf("Delete backref in extent [%llu %llu]\n",
-			       bytenr, num_bytes);
-		} else {
-			error("fail to delete backref in extent [%llu %llu]",
-			       bytenr, num_bytes);
-		}
+	if ((err & (REFERENCER_MISSING | REFERENCER_MISMATCH)) == 0)
+		return err;
+
+	ret = avoid_extents_overwrite(root->fs_info);
+	if (ret)
+		return err;
+
+	trans = btrfs_start_transaction(extent_root, 1);
+	if (IS_ERR(trans)) {
+		ret = PTR_ERR(trans);
+		error("fail to start transaction %s", strerror(-ret));
+		/* nothing happened */
+		ret = 0;
+		goto out;
 	}
+	/* delete the backref */
+	ret = btrfs_free_extent(trans, root->fs_info->fs_root, bytenr,
+			num_bytes, parent, root_objectid, owner, offset);
+	if (!ret) {
+		freed = 1;
+		err &= ~REFERENCER_MISSING;
+		printf("Delete backref in extent [%llu %llu]\n",
+		       bytenr, num_bytes);
+	} else {
+		error("fail to delete backref in extent [%llu %llu]",
+		      bytenr, num_bytes);
+	}
+	btrfs_commit_transaction(trans, extent_root);
 
 	/* btrfs_free_extent may delete the extent */
 	btrfs_release_path(path);
 	ret = btrfs_search_slot(NULL, root, &old_key, path, 0, 0);
-
 	if (ret)
 		ret = -ENOENT;
 	else if (freed)
 		ret = err;
+out:
 	return ret;
 }
 
@@ -3692,8 +3707,7 @@ static int repair_extent_item(struct btrfs_trans_handle *trans,
  *
  * Since we don't use extent_record anymore, introduce new error bit
  */
-static int check_extent_item(struct btrfs_trans_handle *trans,
-			     struct btrfs_fs_info *fs_info,
+static int check_extent_item(struct btrfs_fs_info *fs_info,
 			     struct btrfs_path *path)
 {
 	struct btrfs_extent_item *ei;
@@ -3824,7 +3838,7 @@ next:
 	}
 
 	if (err && repair) {
-		ret = repair_extent_item(trans, fs_info->extent_root, path,
+		ret = repair_extent_item(fs_info->extent_root, path,
 			 key.objectid, num_bytes, parent, root_objectid,
 			 owner, owner_offset, ret);
 		if (ret < 0)
@@ -4244,7 +4258,7 @@ again:
 		break;
 	case BTRFS_EXTENT_ITEM_KEY:
 	case BTRFS_METADATA_ITEM_KEY:
-		ret = check_extent_item(trans, fs_info, path);
+		ret = check_extent_item(fs_info, path);
 		err |= ret;
 		break;
 	case BTRFS_EXTENT_CSUM_KEY:
-- 
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 ` Su Yue [this message]
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 ` [PATCH v5 14/16] btrfs-progs: lowmem: introduce repair_block_accounting() Su Yue
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-11-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.