c3a893d519
- place binaries in /usr tree (UsrMerge project) - adjust mkinitrd script accordingly - add btrfsck repair options for: - rebuild extent records - fix block group accounting - reset csums for rescue nodatasum mount - prune corrupt extent allocation tree blocks - device scanning fixes for dm and multipath - initrd support: move btrfs device scan after block device setup - documentation updates - add csize for file commpressed size - updated restore utility OBS-URL: https://build.opensuse.org/request/show/108879 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/btrfsprogs?expand=0&rev=26
33 lines
771 B
Diff
33 lines
771 B
Diff
From ab19832dce62c53452454897fe1d2eaf2e1dbd59 Mon Sep 17 00:00:00 2001
|
|
From: Chris Mason <chris.mason@oracle.com>
|
|
Date: Mon, 6 Feb 2012 08:53:43 -0500
|
|
Subject: [PATCH 04/18] btrfsck: don't BUG on corrupted extent records
|
|
|
|
---
|
|
btrfsck.c | 5 ++++-
|
|
1 files changed, 4 insertions(+), 1 deletions(-)
|
|
|
|
diff --git a/btrfsck.c b/btrfsck.c
|
|
index a3c6286..90e9c80 100644
|
|
--- a/btrfsck.c
|
|
+++ b/btrfsck.c
|
|
@@ -2441,11 +2441,14 @@ static int process_extent_item(struct cache_tree *extent_cache,
|
|
0);
|
|
break;
|
|
default:
|
|
- BUG();
|
|
+ fprintf(stderr, "corrupt extent record: key %Lu %u %Lu\n",
|
|
+ key.objectid, key.type, key.offset);
|
|
+ goto out;
|
|
}
|
|
ptr += btrfs_extent_inline_ref_size(type);
|
|
}
|
|
WARN_ON(ptr > end);
|
|
+out:
|
|
return 0;
|
|
}
|
|
|
|
--
|
|
1.7.6.233.gd79bc
|
|
|