[PATCH] xfs_io: prefix dedupe command error messages consistently

[PATCH] xfs_io: prefix dedupe command error messages consistently

[Darrick J. Wong]

Prefix the perror output of the dedupe command consistently.  All the
other perror calls reference the ioctl name directly, so we might as
well do that for all the dedupe cases.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 io/reflink.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/io/reflink.c b/io/reflink.c
index d4c745c..dde26b8 100644
--- a/io/reflink.c
+++ b/io/reflink.c
@@ -79,12 +79,12 @@ dedupe_ioctl(
 			goto done;
 		}
 		if (info->status < 0) {
-			fprintf(stderr, "dedupe: %s\n",
+			fprintf(stderr, "XFS_IOC_FILE_EXTENT_SAME: %s\n",
 					_(strerror(-info->status)));
 			goto done;
 		}
 		if (info->status == XFS_EXTENT_DATA_DIFFERS) {
-			fprintf(stderr, "dedupe: %s\n",
+			fprintf(stderr, "XFS_IOC_FILE_EXTENT_SAME: %s\n",
 					_("Extents did not match."));
 			goto done;
 		}

Re: [PATCH] xfs_io: prefix dedupe command error messages consistently

[Eric Sandeen]

On 12/19/16 1:50 PM, Darrick J. Wong wrote:
> Prefix the perror output of the dedupe command consistently.  All the
> other perror calls reference the ioctl name directly, so we might as
> well do that for all the dedupe cases.

I guess it's fine - technically, these aren't perrors.  :)

and there are plenty of places like this too, though:

       } else if (xfsctl(name, file->fd, FS_IOC_FSGETXATTR, &attr) < 0) {
                fprintf(stderr, _("%s: cannot get flags on %s: %s\n"),
                        progname, name, strerror(errno));

as well.  I'd probably argue for an actual ioctl error to include
the ioctl name, but the "eh, can't dedupe" message to be a bit more
friendly (i.e. "dedupe: ...") - but I may be bikeshedding too much?

-Eric


> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
>  io/reflink.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/io/reflink.c b/io/reflink.c
> index d4c745c..dde26b8 100644
> --- a/io/reflink.c
> +++ b/io/reflink.c
> @@ -79,12 +79,12 @@ dedupe_ioctl(
>  			goto done;
>  		}
>  		if (info->status < 0) {
> -			fprintf(stderr, "dedupe: %s\n",
> +			fprintf(stderr, "XFS_IOC_FILE_EXTENT_SAME: %s\n",
>  					_(strerror(-info->status)));
>  			goto done;
>  		}
>  		if (info->status == XFS_EXTENT_DATA_DIFFERS) {
> -			fprintf(stderr, "dedupe: %s\n",
> +			fprintf(stderr, "XFS_IOC_FILE_EXTENT_SAME: %s\n",
>  					_("Extents did not match."));
>  			goto done;
>  		}
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [PATCH] xfs_io: prefix dedupe command error messages consistently

[Eric Sandeen]

On 12/19/16 1:50 PM, Darrick J. Wong wrote:
> Prefix the perror output of the dedupe command consistently.  All the
> other perror calls reference the ioctl name directly, so we might as
> well do that for all the dedupe cases.
> 
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

ok, after some offline discussion, *shrug* this is fine.

Reviewed-by: Eric Sandeen <sandeen@redhat.com>

> ---
>  io/reflink.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/io/reflink.c b/io/reflink.c
> index d4c745c..dde26b8 100644
> --- a/io/reflink.c
> +++ b/io/reflink.c
> @@ -79,12 +79,12 @@ dedupe_ioctl(
>  			goto done;
>  		}
>  		if (info->status < 0) {
> -			fprintf(stderr, "dedupe: %s\n",
> +			fprintf(stderr, "XFS_IOC_FILE_EXTENT_SAME: %s\n",
>  					_(strerror(-info->status)));
>  			goto done;
>  		}
>  		if (info->status == XFS_EXTENT_DATA_DIFFERS) {
> -			fprintf(stderr, "dedupe: %s\n",
> +			fprintf(stderr, "XFS_IOC_FILE_EXTENT_SAME: %s\n",
>  					_("Extents did not match."));
>  			goto done;
>  		}
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>