| Message ID | 1383779755-18228-3-git-send-email-sandeen@redhat.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
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; > -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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;
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(-)