btrfs-progs: check: introduce function to check tree block backref in extent tree

[platform/upstream/btrfs-progs.git] / super-recover.c

diff --git a/super-recover.c b/super-recover.c
index 5920ea6..88ecdee 100644 (file)
--- a/super-recover.c
+++ b/super-recover.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Fujitsu.  All rights reserved.
+ * Copyright (C) 2013 FUJITSU LIMITED.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public
@@ -16,9 +16,6 @@
  * Boston, MA 021110-1307, USA.
  */
 
-#define _XOPEN_SOURCE 500
-#define _GNU_SOURCE 1
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
@@ -69,21 +66,11 @@ void init_recover_superblock(struct btrfs_recover_superblock *recover)
 static
 void free_recover_superblock(struct btrfs_recover_superblock *recover)
 {
-       struct btrfs_device *device;
        struct super_block_record *record;
 
        if (!recover->fs_devices)
                return;
 
-       while (!list_empty(&recover->fs_devices->devices)) {
-               device = list_entry(recover->fs_devices->devices.next,
-                               struct btrfs_device, dev_list);
-               list_del_init(&device->dev_list);
-               free(device->name);
-               free(device);
-       }
-       free(recover->fs_devices);
-
        while (!list_empty(&recover->good_supers)) {
                record = list_entry(recover->good_supers.next,
                                struct super_block_record, list);
@@ -292,7 +279,7 @@ int btrfs_recover_superblocks(const char *dname,
        }
        init_recover_superblock(&recover);
 
-       ret = btrfs_scan_fs_devices(fd, dname, &recover.fs_devices, 0, 0);
+       ret = btrfs_scan_fs_devices(fd, dname, &recover.fs_devices, 0, 1, 0);
        close(fd);
        if (ret) {
                ret = 1;
@@ -323,13 +310,13 @@ int btrfs_recover_superblocks(const char *dname,
                }
        }
        record = recover_get_good_super(&recover);
-       root = open_ctree_with_broken_super(record->device_name,
-                                       record->bytenr, 1);
+       root = open_ctree(record->device_name, record->bytenr,
+                         OPEN_CTREE_RECOVER_SUPER | OPEN_CTREE_WRITES);
        if (!root) {
                ret = 3;
                goto no_recover;
        }
-       /* reset super_bytenr in order that we will rewite all supers */
+       /* reset super_bytenr in order that we will rewrite all supers */
        root->fs_info->super_bytenr = BTRFS_SUPER_INFO_OFFSET;
        ret = write_all_supers(root);
        if (!ret)
@@ -341,6 +328,9 @@ int btrfs_recover_superblocks(const char *dname,
 no_recover:
        recover_err_str(ret);
        free_recover_superblock(&recover);
+       /* check if we have freed fs_devices in close_ctree() */
+       if (!root)
+               btrfs_close_devices(recover.fs_devices);
        return ret;
 }