c8h4/btrfs-progs
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

btrfs-progs: convert: Print different error message if convert partly failed.

Browse source 
When testing under libguestfs, btrfs-convert will never succeed to fix
chunk map, and always fails.

But in that case, it's already a mountable btrfs.
So better to info user with different error message for that case.

The root cause of it is still under investigation.

Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Qu Wenruo 2015-06-09 15:57:40 +08:00 committed by David Sterba
parent 8d1ed12f79
commit 4bdc710542
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
btrfs-convert.c
View file

@ -2292,6 +2292,7 @@ static int do_convert(const char *devname, int datacsum, int packing, int noxatt
{
int i, ret, blocks_per_node;
int fd = -1;
int is_btrfs = 0;
u32 blocksize;
u64 blocks[7];
u64 total_bytes;
@ -2459,6 +2460,7 @@ static int do_convert(const char *devname, int datacsum, int packing, int noxatt
fprintf(stderr, "unable to migrate super block\n");
goto fail;
}
is_btrfs = 1;
root = open_ctree_fd(fd, devname, 0, OPEN_CTREE_WRITES);
if (!root) {
@ -2479,7 +2481,11 @@ static int do_convert(const char *devname, int datacsum, int packing, int noxatt
fail:
if (fd != -1)
close(fd);
fprintf(stderr, "conversion aborted.\n");
if (is_btrfs)
fprintf(stderr,
"WARNING: an error occured during chunk mapping fixup, filesystem mountable but not finalized\n");
else
fprintf(stderr, "conversion aborted\n");
return -1;
}