Skip to contentSkip to conversation

Btrfs-progs: add the ability to remove csums

PATCH Applied Josef Bacik 2 participants 2 messages May 19, 2015 – May 26, 2015 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Btrfs-progs: add the ability to remove csums

Sometimes we need to test what happens when we're missing a csum for a range, so add an option to btrfs-corrupt-block to be able to remove a csum range. Thanks,

---
 btrfs-corrupt-block.c | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)
btrfs-corrupt-block.c +33 -1
index f332bdf..7fa92ab 100644
@@ -110,6 +110,9 @@ static void print_usage(void)
 	fprintf(stderr, "\t-D Corrupt a dir item, must specify key and field\n");
 	fprintf(stderr, "\t-d Delete this item (must specify -K)\n");
 	fprintf(stderr, "\t-r Operate on this root (only works with -d)\n");
+	fprintf(stderr, "\t-C Delete a csum for the specified bytenr.  When "
+		"used with -b it'll delete that many bytes, otherwise it's "
+		"just sectorsize\n");
 	exit(1);
 }
 
@@ -843,6 +846,26 @@ out:
 	return ret;
 }
 
+static int delete_csum(struct btrfs_root *root, u64 bytenr, u64 bytes)
+{
+	struct btrfs_trans_handle *trans;
+	int ret;
+
+	root = root->fs_info->csum_root;
+	trans = btrfs_start_transaction(root, 1);
+	if (IS_ERR(trans)) {
+		fprintf(stderr, "Couldn't start transaction %ld\n",
+			PTR_ERR(trans));
+		return PTR_ERR(trans);
+	}
+
+	ret = btrfs_del_csums(trans, root, bytenr, bytes);
+	if (ret)
+		fprintf(stderr, "Error deleting csums %d\n", ret);
+	btrfs_commit_transaction(trans, root);
+	return ret;
+}
+
 /* corrupt item using NO cow.
  * Because chunk recover will recover based on whole partition scaning,
  * If using COW, chunk recover will use the old item to recover,
@@ -1009,6 +1032,7 @@ int main(int ac, char **av)
 	u64 inode = 0;
 	u64 file_extent = (u64)-1;
 	u64 root_objectid = 0;
+	u64 csum_bytenr = 0;
 	char field[FIELD_BUF_LEN];
 
 	field[0] = '\0';
@@ -1037,10 +1061,11 @@ int main(int ac, char **av)
 			{ "dir-item", 0, NULL, 'D'},
 			{ "delete", 0, NULL, 'd'},
 			{ "root", 0, NULL, 'r'},
+			{ "csum", 1, NULL, 'C'},
 			{ NULL, 0, NULL, 0 }
 		};
 
-		c = getopt_long(ac, av, "l:c:b:eEkuUi:f:x:m:K:IDdr:",
+		c = getopt_long(ac, av, "l:c:b:eEkuUi:f:x:m:K:IDdr:C:",
 				long_options, &option_index);
 		if (c < 0)
 			break;
@@ -1104,6 +1129,9 @@ int main(int ac, char **av)
 			case 'r':
 				root_objectid = arg_strtou64(optarg);
 				break;
+			case 'C':
+				csum_bytenr = arg_strtou64(optarg);
+				break;
 			default:
 				print_usage();
 		}
@@ -1206,6 +1234,10 @@ int main(int ac, char **av)
 		ret = corrupt_dir_item(root, &key, field);
 		goto out_close;
 	}
+	if (csum_bytenr) {
+		ret = delete_csum(root, csum_bytenr, bytes);
+		goto out_close;
+	}
 	if (corrupt_item) {
 		if (!key.objectid)
 			print_usage();
Signature · 1 line
1.8.3.1
Applied
#1 lore raw
Quoted 4 lines · Josef Bacik

Sometimes we need to test what happens when we're missing a csum for a range, so add an option to btrfs-corrupt-block to be able to remove a csum range. Thanks,

Applied, thanks.