[PATCH 0/4] xfsprogs: 4.15 rollup pt. 4

[PATCH 0/4] xfsprogs: 4.15 rollup pt. 4

[Darrick J. Wong]

Hi all,

Four more fixes -- disallow creation of reflink+realtime filesystems, two
things in scrub that coverity complained about, and an addition to scrub so
that it always logs whatever it finds in syslog, even if running
interactively.

The first three are very straightforward, but Eric wanted more comment on the
syslog thing, so if you have an opinion about how hard we try to record all of
scrub's comments to syslog for later QA retrieval, bikeshed now. :)

--D

[PATCH 1/4] mkfs: don't create realtime filesystems with reflink enabled

[Darrick J. Wong]

From: Darrick J. Wong <darrick.wong@oracle.com>

We don't support reflink on the realtime device, so don't let people
create such things.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 mkfs/xfs_mkfs.c |    7 +++++++
 1 file changed, 7 insertions(+)


diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 219b209..b20e3d6 100644
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -2025,6 +2025,13 @@ _("cowextsize not supported without reflink support\n"));
 		usage();
 	}
 
+	if (cli->sb_feat.reflink && cli->xi->rtname) {
+		fprintf(stderr,
+_("reflink not supported with realtime devices\n"));
+		usage();
+		cli->sb_feat.reflink = false;
+	}
+
 	if (cli->sb_feat.rmapbt && cli->xi->rtname) {
 		fprintf(stderr,
 _("rmapbt not supported with realtime devices\n"));

[PATCH 2/4] xfs_scrub: close dir_fd if we don't get a DIR pointer

[Darrick J. Wong]

From: Darrick J. Wong <darrick.wong@oracle.com>

If we don't get a directory pointer, close dir_fd before jumping out.

Fixes-coverity-id: 1428799
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 scrub/vfs.c |    2 ++
 1 file changed, 2 insertions(+)


diff --git a/scrub/vfs.c b/scrub/vfs.c
index e3c8e62..573a2d0 100644
--- a/scrub/vfs.c
+++ b/scrub/vfs.c
@@ -88,6 +88,7 @@ scan_fs_dir(
 	/* Caller-specific directory checks. */
 	if (!sft->dir_fn(ctx, sftd->path, dir_fd, sft->arg)) {
 		sft->moveon = false;
+		close(dir_fd);
 		goto out;
 	}
 
@@ -95,6 +96,7 @@ scan_fs_dir(
 	dir = fdopendir(dir_fd);
 	if (!dir) {
 		str_errno(ctx, sftd->path);
+		close(dir_fd);
 		goto out;
 	}
 	rewinddir(dir);

[PATCH 3/4] xfs_scrub: kill dead code

[Darrick J. Wong]

From: Darrick J. Wong <darrick.wong@oracle.com>

We can't reach the return mess at the bottom of __xfs_scrub_test so get
rid of it.

Fixes-coverity-id: 1428798
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 scrub/scrub.c |    1 -
 1 file changed, 1 deletion(-)


diff --git a/scrub/scrub.c b/scrub/scrub.c
index 0dbe11c..6abca2a 100644
--- a/scrub/scrub.c
+++ b/scrub/scrub.c
@@ -602,7 +602,6 @@ _("Kernel %s %s facility not detected."),
 		str_info(ctx, ctx->mntpoint, "%s", strerror(errno));
 		return true;
 	}
-	return error == 0 || (error && errno != EOPNOTSUPP && errno != ENOTTY);
 }
 
 bool

[PATCH 4/4] xfs_scrub: log operational messages when interactive

[Darrick J. Wong]

From: Darrick J. Wong <darrick.wong@oracle.com>

Record the output of an interactive session in the system log so that
future support requests can get a better picture of what happened.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 scrub/common.c |   37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)


diff --git a/scrub/common.c b/scrub/common.c
index 17c3699..0326e34 100644
--- a/scrub/common.c
+++ b/scrub/common.c
@@ -21,6 +21,7 @@
 #include <pthread.h>
 #include <stdbool.h>
 #include <sys/statvfs.h>
+#include <syslog.h>
 #include "platform_defs.h"
 #include "xfs.h"
 #include "xfs_fs.h"
@@ -29,6 +30,8 @@
 #include "common.h"
 #include "progress.h"
 
+extern char		*progname;
+
 /*
  * Reporting Status to the Console
  *
@@ -64,6 +67,12 @@ static const char *err_str[] = {
 	[S_PREEN]	= "Optimized",
 };
 
+static int log_level[] = {
+	[S_ERROR]	= LOG_ERR,
+	[S_WARN]	= LOG_WARNING,
+	[S_INFO]	= LOG_INFO,
+};
+
 /* If stream is a tty, clear to end of line to clean up progress bar. */
 static inline const char *stream_start(FILE *stream)
 {
@@ -73,6 +82,8 @@ static inline const char *stream_start(FILE *stream)
 }
 
 /* Print a warning string and some warning text. */
+#define LOG_BUFSZ	4096
+#define LOGNAME_BUFSZ	256
 void
 __str_out(
 	struct scrub_ctx	*ctx,
@@ -110,6 +121,32 @@ __str_out(
 		va_end(args);
 	}
 
+	/* If we're running interactively, log the message to syslog too. */
+	if (isatty(fileno(stdin))) {
+		char	logname[LOGNAME_BUFSZ];
+
+		snprintf(logname, LOGNAME_BUFSZ, "%s@%s", progname,
+				ctx->mntpoint);
+		openlog(logname, LOG_PID, LOG_DAEMON);
+
+		if (error) {
+			syslog(LOG_ERR, "%s: %s: %s.",
+					_(err_str[level]), descr,
+					strerror_r(error, buf, DESCR_BUFSZ));
+		} else {
+			char	buf[LOG_BUFSZ];
+			int	sz;
+
+			sz = snprintf(buf, LOG_BUFSZ, "%s: %s: ",
+					_(err_str[level]), descr);
+			va_start(args, format);
+			vsnprintf(buf + sz, LOG_BUFSZ - sz, format, args);
+			va_end(args);
+			syslog(log_level[level], "%s", buf);
+		}
+		closelog();
+	}
+
 	if (debug)
 		fprintf(stream, _(" (%s line %d)"), file, line);
 	fprintf(stream, "\n");

Re: [PATCH 1/4] mkfs: don't create realtime filesystems with reflink enabled

[Eric Sandeen]

On 2/2/18 3:36 PM, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
> 
> We don't support reflink on the realtime device, so don't let people
> create such things.
> 
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

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

> ---
>  mkfs/xfs_mkfs.c |    7 +++++++
>  1 file changed, 7 insertions(+)
> 
> 
> diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
> index 219b209..b20e3d6 100644
> --- a/mkfs/xfs_mkfs.c
> +++ b/mkfs/xfs_mkfs.c
> @@ -2025,6 +2025,13 @@ _("cowextsize not supported without reflink support\n"));
>  		usage();
>  	}
>  
> +	if (cli->sb_feat.reflink && cli->xi->rtname) {
> +		fprintf(stderr,
> +_("reflink not supported with realtime devices\n"));
> +		usage();
> +		cli->sb_feat.reflink = false;
> +	}
> +
>  	if (cli->sb_feat.rmapbt && cli->xi->rtname) {
>  		fprintf(stderr,
>  _("rmapbt not supported with realtime devices\n"));
> 

Re: [PATCH 2/4] xfs_scrub: close dir_fd if we don't get a DIR pointer

[Eric Sandeen]

On 2/2/18 3:36 PM, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
> 
> If we don't get a directory pointer, close dir_fd before jumping out.
> 
> Fixes-coverity-id: 1428799
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

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

> ---
>  scrub/vfs.c |    2 ++
>  1 file changed, 2 insertions(+)
> 
> 
> diff --git a/scrub/vfs.c b/scrub/vfs.c
> index e3c8e62..573a2d0 100644
> --- a/scrub/vfs.c
> +++ b/scrub/vfs.c
> @@ -88,6 +88,7 @@ scan_fs_dir(
>  	/* Caller-specific directory checks. */
>  	if (!sft->dir_fn(ctx, sftd->path, dir_fd, sft->arg)) {
>  		sft->moveon = false;
> +		close(dir_fd);
>  		goto out;
>  	}
>  
> @@ -95,6 +96,7 @@ scan_fs_dir(
>  	dir = fdopendir(dir_fd);
>  	if (!dir) {
>  		str_errno(ctx, sftd->path);
> +		close(dir_fd);
>  		goto out;
>  	}
>  	rewinddir(dir);
> 

Re: [PATCH 3/4] xfs_scrub: kill dead code

[Eric Sandeen]

On 2/2/18 3:36 PM, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
> 
> We can't reach the return mess at the bottom of __xfs_scrub_test so get
> rid of it.
> 
> Fixes-coverity-id: 1428798
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

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

> ---
>  scrub/scrub.c |    1 -
>  1 file changed, 1 deletion(-)
> 
> 
> diff --git a/scrub/scrub.c b/scrub/scrub.c
> index 0dbe11c..6abca2a 100644
> --- a/scrub/scrub.c
> +++ b/scrub/scrub.c
> @@ -602,7 +602,6 @@ _("Kernel %s %s facility not detected."),
>  		str_info(ctx, ctx->mntpoint, "%s", strerror(errno));
>  		return true;
>  	}
> -	return error == 0 || (error && errno != EOPNOTSUPP && errno != ENOTTY);
>  }
>  
>  bool
> 

[PATCH 5/4] xfs_io: fix copy_file_range symbol name collision

[Darrick J. Wong]

From: Darrick J. Wong <darrick.wong@oracle.com>

glibc 2.27 has a copy_file_range wrapper, so we need to change our
internal function out of the way to avoid compiler warnings.

Reported-by: fredrik@crux.nu
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 io/copy_file_range.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/io/copy_file_range.c b/io/copy_file_range.c
index d1dfc5a..99fba20 100644
--- a/io/copy_file_range.c
+++ b/io/copy_file_range.c
@@ -42,13 +42,18 @@ copy_range_help(void)
 "));
 }
 
+/*
+ * Issue a raw copy_file_range syscall; for our test program we don't want the
+ * glibc buffered copy fallback.
+ */
 static loff_t
-copy_file_range(int fd, loff_t *src, loff_t *dst, size_t len)
+copy_file_range_cmd(int fd, loff_t *src, loff_t *dst, size_t len)
 {
 	loff_t ret;
 
 	do {
-		ret = syscall(__NR_copy_file_range, fd, src, file->fd, dst, len, 0);
+		ret = syscall(__NR_copy_file_range, fd, src, file->fd, dst,
+				len, 0);
 		if (ret == -1) {
 			perror("copy_range");
 			return errno;
@@ -130,7 +135,7 @@ copy_range_f(int argc, char **argv)
 		copy_dst_truncate();
 	}
 
-	ret = copy_file_range(fd, &src, &dst, len);
+	ret = copy_file_range_cmd(fd, &src, &dst, len);
 	close(fd);
 	return ret;
 }

Re: [PATCH 5/4] xfs_io: fix copy_file_range symbol name collision

[Eric Sandeen]

On 2/5/18 10:50 AM, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
> 
> glibc 2.27 has a copy_file_range wrapper, so we need to change our
> internal function out of the way to avoid compiler warnings.
> 
> Reported-by: fredrik@crux.nu
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

Ok, sure.  Yay namespace.

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

> ---
>  io/copy_file_range.c |   11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/io/copy_file_range.c b/io/copy_file_range.c
> index d1dfc5a..99fba20 100644
> --- a/io/copy_file_range.c
> +++ b/io/copy_file_range.c
> @@ -42,13 +42,18 @@ copy_range_help(void)
>  "));
>  }
>  
> +/*
> + * Issue a raw copy_file_range syscall; for our test program we don't want the
> + * glibc buffered copy fallback.
> + */
>  static loff_t
> -copy_file_range(int fd, loff_t *src, loff_t *dst, size_t len)
> +copy_file_range_cmd(int fd, loff_t *src, loff_t *dst, size_t len)
>  {
>  	loff_t ret;
>  
>  	do {
> -		ret = syscall(__NR_copy_file_range, fd, src, file->fd, dst, len, 0);
> +		ret = syscall(__NR_copy_file_range, fd, src, file->fd, dst,
> +				len, 0);
>  		if (ret == -1) {
>  			perror("copy_range");
>  			return errno;
> @@ -130,7 +135,7 @@ copy_range_f(int argc, char **argv)
>  		copy_dst_truncate();
>  	}
>  
> -	ret = copy_file_range(fd, &src, &dst, len);
> +	ret = copy_file_range_cmd(fd, &src, &dst, len);
>  	close(fd);
>  	return ret;
>  }
> --
> 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
>