From a44db0f367d57cb6d9e4d137a16d55536358f583 Mon Sep 17 00:00:00 2001 From: Graham Inggs Date: Tue, 28 Sep 2021 14:56:06 +0200 Subject: [PATCH] zdump, man pages: remove references to 'nonempty' option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In FUSE 3, nonempty is always true, and has been removed. By default it is false on FUSE 2. Therefore, remove 'nonempty' option from zdump and references to the same in man pages. GitHub-ID: https://github.com/ibm-s390-linux/s390-tools/pull/117 Signed-off-by: Graham Inggs Signed-off-by: Jan Höppner --- cmsfs-fuse/cmsfs-fuse.1 | 3 --- hmcdrvfs/hmcdrvfs.1 | 3 --- zdsfs/zdsfs.1 | 3 --- zdump/zfuse.c | 2 +- 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/cmsfs-fuse/cmsfs-fuse.1 b/cmsfs-fuse/cmsfs-fuse.1 index c3082a5b..9fc4e539 100644 --- a/cmsfs-fuse/cmsfs-fuse.1 +++ b/cmsfs-fuse/cmsfs-fuse.1 @@ -80,9 +80,6 @@ Allow access by other users \fB\-o\fR allow_root Allow access by root .TP -\fB\-o\fR nonempty -Allow mounts over non\-empty file/dir -.TP \fB\-o\fR default_permissions Enable permission checking by kernel .TP diff --git a/hmcdrvfs/hmcdrvfs.1 b/hmcdrvfs/hmcdrvfs.1 index 5f1db3de..f613c775 100644 --- a/hmcdrvfs/hmcdrvfs.1 +++ b/hmcdrvfs/hmcdrvfs.1 @@ -111,9 +111,6 @@ allow access by other users .B -o allow_root allow access by root .TP -.B -o nonempty -allow mounts over non-empty file/dir -.TP .B -o default_permissions enable permission checking by kernel .TP diff --git a/zdsfs/zdsfs.1 b/zdsfs/zdsfs.1 index 21acb70a..f50a05af 100644 --- a/zdsfs/zdsfs.1 +++ b/zdsfs/zdsfs.1 @@ -227,9 +227,6 @@ Allow access by other users \fB\-o\fR allow_root Allow access by root .TP -\fB\-o\fR nonempty -Allow mounts over non\-empty file/dir -.TP \fB\-o\fR default_permissions Enable permission checking by kernel .TP diff --git a/zdump/zfuse.c b/zdump/zfuse.c index a76e7bf2..a8aa54a8 100644 --- a/zdump/zfuse.c +++ b/zdump/zfuse.c @@ -211,7 +211,7 @@ int zfuse_mount_dump(void) fuse_opt_add_arg(&args, "zgetdump"); fuse_opt_add_arg(&args, "-s"); snprintf(tmp_str, sizeof(tmp_str), - "-ofsname=%s,ro,default_permissions,nonempty", + "-ofsname=%s,ro,default_permissions", g.opts.device); fuse_opt_add_arg(&args, tmp_str); fuse_opt_add_arg(&args, g.opts.mount_point);