All of lore.kernel.org
 help / color / mirror / Atom feed
From: Anand Jain <Anand.Jain@oracle.com>
To: Eric Sandeen <sandeen@redhat.com>
Cc: linux-btrfs@vger.kernel.org
Subject: Re: [PATCH 02/16] btrfs-progs: fix error returns in get_df()
Date: Thu, 07 Nov 2013 10:33:45 +0800	[thread overview]
Message-ID: <527AFC09.6040500@oracle.com> (raw)
In-Reply-To: <1383779755-18228-3-git-send-email-sandeen@redhat.com>


  I had just retained whats in the original. But this is
  good change. Thanks Eric.

Reviewed-by: Anand Jain <anand.jain@oracle.com>


On 11/07/2013 07:15 AM, Eric Sandeen wrote:
> get_df returns -ERRNO, or maybe (+)errno, or even 0 in
> the case where we inexplicably got 0 total_spaces from
> the BTRFS_IOC_SPACE_INFO.
>
> Consistently return a negative error number, and return
> -ENOENT rather than 0 for total_spaces == 0, so that the
> caller will know that **sargs_ret hasn't been set up.
>
> Signed-off-by: Eric Sandeen <sandeen@redhat.com>
> ---
>   cmds-filesystem.c |    7 ++++---
>   1 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/cmds-filesystem.c b/cmds-filesystem.c
> index 0bfd710..e6642ef 100644
> --- a/cmds-filesystem.c
> +++ b/cmds-filesystem.c
> @@ -106,11 +106,12 @@ static int get_df(int fd, struct btrfs_ioctl_space_args **sargs_ret)
>   		fprintf(stderr, "ERROR: couldn't get space info - %s\n",
>   			strerror(e));
>   		free(sargs);
> -		return ret;
> +		return -e;
>   	}
> +	/* This really should never happen */
>   	if (!sargs->total_spaces) {
>   		free(sargs);
> -		return 0;
> +		return -ENOENT;
>   	}
>   	count = sargs->total_spaces;
>   	free(sargs);
> @@ -128,7 +129,7 @@ static int get_df(int fd, struct btrfs_ioctl_space_args **sargs_ret)
>   		fprintf(stderr, "ERROR: get space info count %llu - %s\n",
>   				count, strerror(e));
>   		free(sargs);
> -		return ret;
> +		return -e;
>   	}
>   	*sargs_ret = sargs;
>   	return 0;
>

  reply	other threads:[~2013-11-07  2:25 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-06 23:15 [PATCH 00/16] btrfs-progs: Several more static analysis defect fixes Eric Sandeen
2013-11-06 23:15 ` [PATCH 01/16] btrfs-progs: fix potential double-frees in cmd_subvol_delete() Eric Sandeen
2013-11-06 23:15 ` [PATCH 02/16] btrfs-progs: fix error returns in get_df() Eric Sandeen
2013-11-07  2:33   ` Anand Jain [this message]
2013-11-06 23:15 ` [PATCH 03/16] btrfs-progs: use strncpy in btrfs_scan_lblkid() Eric Sandeen
2013-11-07  2:43   ` [PATCH] " Anand Jain
2013-11-06 23:15 ` [PATCH 04/16] btrfs-progs: fix test for return of realpath in find_mount_root() Eric Sandeen
2013-11-07  2:55   ` Anand Jain
2013-11-06 23:15 ` [PATCH 05/16] btrfs-progs: don't leak fd in test_dev_for_mkfs() error paths Eric Sandeen
2013-11-07  3:05   ` Anand Jain
2013-11-06 23:15 ` [PATCH 06/16] btrfs-progs: fix leak of "buf" in make_btrfs() " Eric Sandeen
2013-11-06 23:15 ` [PATCH 07/16] btrfs-progs: don't leak buffer on add_file_items() error Eric Sandeen
2013-11-06 23:15 ` [PATCH 08/16] btrfs-progs: fix resource leak in scrub_start() Eric Sandeen
2013-11-07  1:48   ` Wang Shilong
2013-11-07  1:50     ` Wang Shilong
2013-11-07  3:46       ` Eric Sandeen
2013-11-07  5:06         ` Wang Shilong
2013-11-06 23:15 ` [PATCH 09/16] btrfs-progs: btrfs_scan_kernel(): fd==0 is not an error Eric Sandeen
2013-11-07  4:29   ` Anand Jain
2013-11-06 23:15 ` [PATCH 10/16] btrfs-progs: Check for open failure in btrfs_scan_lblkid() Eric Sandeen
2013-11-06 23:15 ` [PATCH 11/16] btrfs-progs: pass positive errno to strerror in cmd_df() Eric Sandeen
2013-11-07  4:43   ` Anand Jain
2013-11-06 23:15 ` [PATCH 12/16] btrfs-progs: remove more dead code from check_extent_refs Eric Sandeen
2013-11-06 23:15 ` [PATCH 13/16] btrfs-progs: check btrfs_scan_one_device in btrfs_scan_lblkid() Eric Sandeen
2013-11-07  8:34   ` Anand Jain
2013-11-06 23:15 ` [PATCH 14/16] btrfs-progs: check for fstat failure in cmd_defrag Eric Sandeen
2013-11-06 23:15 ` [PATCH 15/16] btrfs-progs: annotate fallthroughs in parse_size Eric Sandeen
2013-11-06 23:15 ` [PATCH 16/16] btrfs-progs: annotate fallthroughs in parse_limit Eric Sandeen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=527AFC09.6040500@oracle.com \
    --to=anand.jain@oracle.com \
    --cc=linux-btrfs@vger.kernel.org \
    --cc=sandeen@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.