X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=super-recover.c;h=6b80416f976a63922fa56430690a9de1c1c3a927;hb=a7a1ea0f4f2a1d6eeeb3d106e062c7f1034f16d4;hp=a6271a27bf0e2cfae0079a11fcd7252883e8efc4;hpb=4735d0bb8248a3900f420cb9144e4f7969f0b44d;p=platform%2Fupstream%2Fbtrfs-progs.git

diff --git a/super-recover.c b/super-recover.c
index a6271a2..6b80416 100644
--- 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);
@@ -101,24 +88,6 @@ void free_recover_superblock(struct btrfs_recover_superblock *recover)
 	}
 }
 
-static int check_super(u64 bytenr, struct btrfs_super_block *sb)
-{
-	int csum_size = btrfs_super_csum_size(sb);
-	char result[csum_size];
-	u32 crc = ~(u32)0;
-
-	if (btrfs_super_bytenr(sb) != bytenr)
-		return 0;
-	if (sb->magic != cpu_to_le64(BTRFS_MAGIC))
-		return 0;
-
-	crc = btrfs_csum_data(NULL, (char *)sb + BTRFS_CSUM_SIZE,
-			crc, BTRFS_SUPER_INFO_SIZE - BTRFS_CSUM_SIZE);
-	btrfs_csum_final(crc, result);
-
-	return !memcmp(sb, &result, csum_size);
-}
-
 static int add_superblock_record(struct btrfs_super_block *sb, char *fname,
 			u64 bytenr, struct list_head *head)
 {
@@ -146,24 +115,20 @@ read_dev_supers(char *filename, struct btrfs_recover_superblock *recover)
 	int i, ret, fd;
 	u8 buf[BTRFS_SUPER_INFO_SIZE];
 	u64 max_gen, bytenr;
+	struct btrfs_super_block *sb = (struct btrfs_super_block *)buf;
+
 	/* just ignore errno that were set in btrfs_scan_fs_devices() */
 	errno = 0;
 
-	struct btrfs_super_block *sb = (struct btrfs_super_block *)buf;
-
-	fd = open(filename, O_RDONLY, 0666);
+	fd = open(filename, O_RDONLY);
 	if (fd < 0)
 		return -errno;
 
 	for (i = 0; i < BTRFS_SUPER_MIRROR_MAX; i++) {
 		bytenr = btrfs_sb_offset(i);
-		ret = pread64(fd, buf, sizeof(buf), bytenr);
-		if (ret < sizeof(buf)) {
-			ret = -errno;
-			goto out;
-		}
-		ret = check_super(bytenr, sb);
-		if (ret) {
+
+		ret = btrfs_read_dev_super(fd, sb, bytenr, SBREAD_DEFAULT);
+		if (!ret) {
 			ret = add_superblock_record(sb, filename, bytenr,
 							&recover->good_supers);
 			if (ret)
@@ -171,13 +136,18 @@ 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 {
+		} else if (ret == -EIO){
+			/*
+			 * Skip superblock which doesn't exist, only adds
+			 * really corrupted superblock
+			 */
 			ret = add_superblock_record(sb, filename, bytenr,
 						&recover->bad_supers);
 			if (ret)
 				goto out;
 		}
 	}
+	ret = 0;
 out:
 	close(fd);
 	return ret;
@@ -292,7 +262,8 @@ 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,
+			SBREAD_RECOVER, 0);
 	close(fd);
 	if (ret) {
 		ret = 1;
@@ -329,9 +300,9 @@ int btrfs_recover_superblocks(const char *dname,
 		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);
+	ret = write_all_supers(root->fs_info);
 	if (!ret)
 		ret = 2;
 	else
@@ -341,6 +312,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;
 }