path: root/super-recover.c
diff options
authorNikolay Borisov <>2017-12-05 10:39:49 +0200
committerDavid Sterba <>2018-01-31 15:14:01 +0100
commit4487aa64e73ab0f029290b67f3d619858ad516bb (patch)
tree5a3c5b61831406ed4fcbb7abe14bc74d98a7c824 /super-recover.c
parent90a16b10b328d63ea90b3f4a04fd52a0bc0b689f (diff)
btrfs-progs: super-recover: fix the broken sb detection
Commit 3296d058b7ce ("btrfs-progs: super-recover: Reuse btrfs_read_dev_super function") changed the logic when a superblock is added to the bad block list to depend on -EIO. However currently btrfs_read_dev_super doesn't return -EIO when the fist super block is broken. Instead it returns -1. This causes the super-recovery logic to miss the fact that the first super block is completely broken. Fix this by considering any error code from btrfs_read_dev_super other than -ENOENT to mean that the super block is corrupted. -ENOENT means that the superblock copy is not part of the fs i.e. it's smaller than the offset of the block. This can only occur for the 2nd copy at 256gb mark. Signed-off-by: Nikolay Borisov <> Reviewed-by: Qu Wenruo <> Signed-off-by: David Sterba <>
Diffstat (limited to 'super-recover.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/super-recover.c b/super-recover.c
index e1251310..880fd771 100644
--- a/super-recover.c
+++ b/super-recover.c
@@ -136,7 +136,7 @@ read_dev_supers(char *filename, struct btrfs_recover_superblock *recover)
max_gen = btrfs_super_generation(sb);
if (max_gen > recover->max_generation)
recover->max_generation = max_gen;
- } else if (ret == -EIO){
+ } else if (ret != -ENOENT){
* Skip superblock which doesn't exist, only adds
* really corrupted superblock