From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-btrfs-owner@vger.kernel.org>
Received: from cn.fujitsu.com ([59.151.112.132]:45634 "EHLO
	heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org
	with ESMTP id S1751014AbaFXDK7 (ORCPT
	<rfc822;linux-btrfs@vger.kernel.org>);
	Mon, 23 Jun 2014 23:10:59 -0400
Message-ID: <1403579143.6858.1.camel@localhost.localdomain>
Subject: Re: [PATCH v2 3/4] btrfs-progs: delete invalid output file when
 btrfs-image failed
From: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
To: <dsterba@suse.cz>
CC: <linux-btrfs@vger.kernel.org>
Date: Tue, 24 Jun 2014 11:05:43 +0800
In-Reply-To: <1403577513-6201-1-git-send-email-guihc.fnst@cn.fujitsu.com>
References: <20140623141557.GG1553@twin.jikos.cz>
	 <1403577513-6201-1-git-send-email-guihc.fnst@cn.fujitsu.com>
Content-Type: text/plain; charset="UTF-8"
MIME-Version: 1.0
Sender: linux-btrfs-owner@vger.kernel.org
List-ID: <linux-btrfs.vger.kernel.org>

On Tue, 2014-06-24 at 10:38 +0800, Gui Hecheng wrote:
> When btrfs-image failed to create an image, the invalid output file
> had better be deleted to prevent being used mistakenly in the future.
> 
> Signed-off-by: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
> ---
> changelog
> 	v1->v2: use a new local variable to avoid return value overwritten
> ---
>  btrfs-image.c | 12 +++++++++++-
>  1 file changed, 11 insertions(+), 1 deletion(-)
> 
> diff --git a/btrfs-image.c b/btrfs-image.c
> index c18dff1..321c331 100644
> --- a/btrfs-image.c
> +++ b/btrfs-image.c
> @@ -2604,8 +2604,18 @@ int main(int argc, char *argv[])
>  out:
>  	if (out == stdout)
>  		fflush(out);
> -	else
> +	else {
>  		fclose(out);
> +		if (ret && create) {
> +			int unlink_ret;
> +		       
> +			unlink_ret = unlink(target);
> +			if (unlink_ret)
> +				fprintf(stderr,
> +					"unlink output file failed : %s\n",
> +					strerror(errno));
> +		}
> +	}
>  
>  	return !!ret;
>  }
Sorry, I will kick out the tailing whitespace and send a v3. Please
*ignore* this.