Re: [PATCH] Btrfs-progs: fail gracefully on error from open_ctree()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, Nov 01, 2011 at 11:47:22PM +0200, Ilya Dryomov wrote:
> --- a/mkfs.c
> +++ b/mkfs.c
> @@ -1328,7 +1328,12 @@ int main(int ac, char **av)
>  		fprintf(stderr, "error during mkfs %d\n", ret);
>  		exit(1);
>  	}
> +
>  	root = open_ctree(file, 0, O_RDWR);
> +	if (!root) {
> +		fprintf(stderr, "ctree init failed\n");
> +		return -1;

I know you just moved the code, but this should be exit(1), same as the
rest of the function does

> +	}
>  	root->fs_info->alloc_start = alloc_start;
>  
>  	ret = make_root_dir(root, mixed);
> @@ -1343,10 +1348,6 @@ int main(int ac, char **av)
>  		goto raid_groups;
>  
>  	btrfs_register_one_device(file);
> -	if (!root) {
> -		fprintf(stderr, "ctree init failed\n");
> -		return -1;
> -	}
>  
>  	zero_end = 1;
>  	while(ac-- > 0) {


david
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Filesystem Development]     [Linux NFS]     [Linux NILFS]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux