Merge commit 'a1e55b412149a2b2ced44c07ea5c285c04c243fb'

[refind] / filesystems / fsw_btrfs.c

diff --git a/filesystems/fsw_btrfs.c b/filesystems/fsw_btrfs.c
index 7359c44cc2c16328a924dfe1b5d48a2e9cac4fa9..c05547de5006760c5ce6b1862a4d3e0f674ca211 100644 (file)
--- a/filesystems/fsw_btrfs.c
+++ b/filesystems/fsw_btrfs.c
@@ -60,7 +60,6 @@
 #include "scandisk.c"
 
 #define BTRFS_DEFAULT_BLOCK_SIZE 4096
-//#define BTRFS_DEFAULT_BLOCK_SIZE 8192
 #define BTRFS_INITIAL_BCACHE_SIZE 1024
 #define GRUB_BTRFS_SIGNATURE "_BHRfS_M"
 
@@ -407,7 +406,7 @@ static fsw_status_t btrfs_read_superblock (struct fsw_volume *vol, struct btrfs_
             break;
 
         err = fsw_block_get(vol, superblock_pos[i], 0, (void **)&buffer);
-        if (err == FSW_UNSUPPORTED) {
+        if (err) {
             fsw_block_release(vol, superblock_pos[i], buffer);
             break;
         }
@@ -1863,7 +1862,7 @@ out:
 //
 
 struct fsw_fstype_table   FSW_FSTYPE_TABLE_NAME(btrfs) = {
-    { FSW_STRING_TYPE_UTF8, 4, 4, "btrfs" },
+    { FSW_STRING_TYPE_UTF8, 5, 5, "btrfs" },
     sizeof(struct fsw_btrfs_volume),
     sizeof(struct fsw_btrfs_dnode),