From c3ae9321bf27c0cab64b032c57bbad42538e89aa Mon Sep 17 00:00:00 2001 From: Ryan Moeller Date: Fri, 30 Oct 2020 11:55:59 -0400 Subject: [PATCH] Update references to nonexistent man pages in code Refer to the correct section or alternative for FreeBSD and Linux. Reviewed-by: George Melikov Reviewed-by: Brian Behlendorf Signed-off-by: Ryan Moeller Closes #11132 --- cmd/zfs/zfs_main.c | 14 +++++++------- include/libzfs.h | 4 ++-- include/sys/fs/zfs.h | 2 +- lib/libzfs/libzfs_util.c | 10 +++++----- man/man5/zpool-features.5 | 10 +++++----- module/os/freebsd/zfs/zfs_vfsops.c | 2 +- module/os/linux/zfs/zfs_vfsops.c | 2 +- module/zcommon/zfs_prop.c | 4 ++-- module/zfs/dsl_scan.c | 2 +- module/zfs/metaslab.c | 4 ++-- module/zfs/spa_history.c | 2 +- module/zfs/spa_misc.c | 2 +- module/zfs/vdev.c | 2 +- module/zfs/zio.c | 2 +- .../cli_root/zfs_copies/zfs_copies_002_pos.ksh | 2 +- 15 files changed, 32 insertions(+), 32 deletions(-) diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c index 42c180890..f609a4e70 100644 --- a/cmd/zfs/zfs_main.c +++ b/cmd/zfs/zfs_main.c @@ -6596,9 +6596,9 @@ share_mount_one(zfs_handle_t *zhp, int op, int flags, char *protocol, (void) fprintf(stderr, gettext("cannot share '%s': " "legacy share\n"), zfs_get_name(zhp)); - (void) fprintf(stderr, gettext("use share(1M) to " - "share this filesystem, or set " - "sharenfs property on\n")); + (void) fprintf(stderr, gettext("use exports(5) or " + "smb.conf(5) to share this filesystem, or set " + "the sharenfs or sharesmb property\n")); return (1); } @@ -6613,7 +6613,7 @@ share_mount_one(zfs_handle_t *zhp, int op, int flags, char *protocol, (void) fprintf(stderr, gettext("cannot %s '%s': " "legacy mountpoint\n"), cmdname, zfs_get_name(zhp)); - (void) fprintf(stderr, gettext("use %s(1M) to " + (void) fprintf(stderr, gettext("use %s(8) to " "%s this filesystem\n"), cmdname, cmdname); return (1); } @@ -7416,8 +7416,8 @@ unshare_unmount(int op, int argc, char **argv) "unshare '%s': legacy share\n"), zfs_get_name(zhp)); (void) fprintf(stderr, gettext("use " - "unshare(1M) to unshare this " - "filesystem\n")); + "exports(5) or smb.conf(5) to unshare " + "this filesystem\n")); ret = 1; } else if (!zfs_is_shared(zhp)) { (void) fprintf(stderr, gettext("cannot " @@ -7435,7 +7435,7 @@ unshare_unmount(int op, int argc, char **argv) "unmount '%s': legacy " "mountpoint\n"), zfs_get_name(zhp)); (void) fprintf(stderr, gettext("use " - "umount(1M) to unmount this " + "umount(8) to unmount this " "filesystem\n")); ret = 1; } else if (!zfs_is_mounted(zhp, NULL)) { diff --git a/include/libzfs.h b/include/libzfs.h index e0b2676a4..337e4934a 100644 --- a/include/libzfs.h +++ b/include/libzfs.h @@ -88,8 +88,8 @@ typedef enum zfs_error { EZFS_ZONED, /* used improperly in local zone */ EZFS_MOUNTFAILED, /* failed to mount dataset */ EZFS_UMOUNTFAILED, /* failed to unmount dataset */ - EZFS_UNSHARENFSFAILED, /* unshare(1M) failed */ - EZFS_SHARENFSFAILED, /* share(1M) failed */ + EZFS_UNSHARENFSFAILED, /* failed to unshare over nfs */ + EZFS_SHARENFSFAILED, /* failed to share over nfs */ EZFS_PERM, /* permission denied */ EZFS_NOSPC, /* out of space */ EZFS_FAULT, /* bad address */ diff --git a/include/sys/fs/zfs.h b/include/sys/fs/zfs.h index fe63d735b..211dd6d50 100644 --- a/include/sys/fs/zfs.h +++ b/include/sys/fs/zfs.h @@ -249,7 +249,7 @@ typedef enum { ZPOOL_NUM_PROPS } zpool_prop_t; -/* Small enough to not hog a whole line of printout in zpool(1M). */ +/* Small enough to not hog a whole line of printout in zpool(8). */ #define ZPROP_MAX_COMMENT 32 #define ZPROP_VALUE "value" diff --git a/lib/libzfs/libzfs_util.c b/lib/libzfs/libzfs_util.c index a457fbfd0..95cb32957 100644 --- a/lib/libzfs/libzfs_util.c +++ b/lib/libzfs/libzfs_util.c @@ -148,15 +148,15 @@ libzfs_error_description(libzfs_handle_t *hdl) case EZFS_MOUNTFAILED: return (dgettext(TEXT_DOMAIN, "mount failed")); case EZFS_UMOUNTFAILED: - return (dgettext(TEXT_DOMAIN, "umount failed")); + return (dgettext(TEXT_DOMAIN, "unmount failed")); case EZFS_UNSHARENFSFAILED: - return (dgettext(TEXT_DOMAIN, "unshare(1M) failed")); + return (dgettext(TEXT_DOMAIN, "NFS share removal failed")); case EZFS_SHARENFSFAILED: - return (dgettext(TEXT_DOMAIN, "share(1M) failed")); + return (dgettext(TEXT_DOMAIN, "NFS share creation failed")); case EZFS_UNSHARESMBFAILED: - return (dgettext(TEXT_DOMAIN, "smb remove share failed")); + return (dgettext(TEXT_DOMAIN, "SMB share removal failed")); case EZFS_SHARESMBFAILED: - return (dgettext(TEXT_DOMAIN, "smb add share failed")); + return (dgettext(TEXT_DOMAIN, "SMB share creation failed")); case EZFS_PERM: return (dgettext(TEXT_DOMAIN, "permission denied")); case EZFS_NOSPC: diff --git a/man/man5/zpool-features.5 b/man/man5/zpool-features.5 index 36c4343a1..08a84ece2 100644 --- a/man/man5/zpool-features.5 +++ b/man/man5/zpool-features.5 @@ -676,11 +676,11 @@ When the \fBmulti_vdev_crash_dump\fR feature is set to \fBenabled\fR, the administrator can use the \fBdumpadm\fR(1M) command to configure a dump device on a pool comprised of multiple vdevs. -Under Linux this feature is registered for compatibility but not used. -New pools created under Linux will have the feature \fBenabled\fR but -will never transition to \fB\fBactive\fR. This functionality is not -required in order to support crash dumps under Linux. Existing pools -where this feature is \fB\fBactive\fR can be imported. +Under FreeBSD and Linux this feature is registered for compatibility but not +used. New pools created under FreeBSD and Linux will have the feature +\fBenabled\fR but will never transition to \fB\fBactive\fR. This functionality +is not required in order to support crash dumps under FreeBSD and Linux. +Existing pools where this feature is \fB\fBactive\fR can be imported. .RE .sp diff --git a/module/os/freebsd/zfs/zfs_vfsops.c b/module/os/freebsd/zfs/zfs_vfsops.c index 671b939b5..55ed2e25d 100644 --- a/module/os/freebsd/zfs/zfs_vfsops.c +++ b/module/os/freebsd/zfs/zfs_vfsops.c @@ -433,7 +433,7 @@ zfs_sync(vfs_t *vfsp, int waitfor) } else { /* * Sync all ZFS filesystems. This is what happens when you - * run sync(1M). Unlike other filesystems, ZFS honors the + * run sync(8). Unlike other filesystems, ZFS honors the * request by waiting for all pools to commit all dirty data. */ spa_sync_allpools(); diff --git a/module/os/linux/zfs/zfs_vfsops.c b/module/os/linux/zfs/zfs_vfsops.c index b218237d0..6c0d8134c 100644 --- a/module/os/linux/zfs/zfs_vfsops.c +++ b/module/os/linux/zfs/zfs_vfsops.c @@ -294,7 +294,7 @@ zfs_sync(struct super_block *sb, int wait, cred_t *cr) } else { /* * Sync all ZFS filesystems. This is what happens when you - * run sync(1M). Unlike other filesystems, ZFS honors the + * run sync(1). Unlike other filesystems, ZFS honors the * request by waiting for all pools to commit all dirty data. */ spa_sync_allpools(); diff --git a/module/zcommon/zfs_prop.c b/module/zcommon/zfs_prop.c index 0352b13aa..89ddc59b2 100644 --- a/module/zcommon/zfs_prop.c +++ b/module/zcommon/zfs_prop.c @@ -551,14 +551,14 @@ zfs_prop_init(void) PROP_INHERIT, ZFS_TYPE_FILESYSTEM, " | legacy | none", "MOUNTPOINT"); zprop_register_string(ZFS_PROP_SHARENFS, "sharenfs", "off", - PROP_INHERIT, ZFS_TYPE_FILESYSTEM, "on | off | share(1M) options", + PROP_INHERIT, ZFS_TYPE_FILESYSTEM, "on | off | NFS share options", "SHARENFS"); zprop_register_string(ZFS_PROP_TYPE, "type", NULL, PROP_READONLY, ZFS_TYPE_DATASET | ZFS_TYPE_BOOKMARK, "filesystem | volume | snapshot | bookmark", "TYPE"); zprop_register_string(ZFS_PROP_SHARESMB, "sharesmb", "off", PROP_INHERIT, ZFS_TYPE_FILESYSTEM, - "on | off | sharemgr(1M) options", "SHARESMB"); + "on | off | SMB share options", "SHARESMB"); zprop_register_string(ZFS_PROP_MLSLABEL, "mlslabel", ZFS_MLSLABEL_DEFAULT, PROP_INHERIT, ZFS_TYPE_DATASET, "", "MLSLABEL"); diff --git a/module/zfs/dsl_scan.c b/module/zfs/dsl_scan.c index 4704781bf..f6a5ceca6 100644 --- a/module/zfs/dsl_scan.c +++ b/module/zfs/dsl_scan.c @@ -3987,7 +3987,7 @@ dsl_scan_scrub_cb(dsl_pool_t *dp, /* * Keep track of how much data we've examined so that - * zpool(1M) status can make useful progress reports. + * zpool(8) status can make useful progress reports. */ scn->scn_phys.scn_examined += DVA_GET_ASIZE(dva); spa->spa_scan_pass_exam += DVA_GET_ASIZE(dva); diff --git a/module/zfs/metaslab.c b/module/zfs/metaslab.c index 133005b22..325f505b7 100644 --- a/module/zfs/metaslab.c +++ b/module/zfs/metaslab.c @@ -5674,7 +5674,7 @@ metaslab_claim_concrete(vdev_t *vd, uint64_t offset, uint64_t size, range_tree_remove(msp->ms_allocatable, offset, size); range_tree_clear(msp->ms_trim, offset, size); - if (spa_writeable(spa)) { /* don't dirty if we're zdb(1M) */ + if (spa_writeable(spa)) { /* don't dirty if we're zdb(8) */ metaslab_class_t *mc = msp->ms_group->mg_class; multilist_sublist_t *mls = multilist_sublist_lock_obj(mc->mc_metaslab_txg_list, msp); @@ -5721,7 +5721,7 @@ metaslab_claim_impl(vdev_t *vd, uint64_t offset, uint64_t size, uint64_t txg) metaslab_claim_cb_arg_t arg; /* - * Only zdb(1M) can claim on indirect vdevs. This is used + * Only zdb(8) can claim on indirect vdevs. This is used * to detect leaks of mapped space (that are not accounted * for in the obsolete counts, spacemap, or bpobj). */ diff --git a/module/zfs/spa_history.c b/module/zfs/spa_history.c index 2ab588154..2939c0366 100644 --- a/module/zfs/spa_history.c +++ b/module/zfs/spa_history.c @@ -321,7 +321,7 @@ spa_history_log_sync(void *arg, dmu_tx_t *tx) * posted as a result of the ZPOOL_HIST_CMD key being present * it would result in only one sysevent being posted with the * full command line arguments, requiring the consumer to know - * how to parse and understand zfs(1M) command invocations. + * how to parse and understand zfs(8) command invocations. */ spa_history_log_notify(spa, nvl); } else if (nvlist_exists(nvl, ZPOOL_HIST_IOCTL)) { diff --git a/module/zfs/spa_misc.c b/module/zfs/spa_misc.c index 042104728..1640dcedd 100644 --- a/module/zfs/spa_misc.c +++ b/module/zfs/spa_misc.c @@ -1366,7 +1366,7 @@ spa_vdev_state_exit(spa_t *spa, vdev_t *vd, int error) /* * If anything changed, wait for it to sync. This ensures that, - * from the system administrator's perspective, zpool(1M) commands + * from the system administrator's perspective, zpool(8) commands * are synchronous. This is important for things like zpool offline: * when the command completes, you expect no further I/O from ZFS. */ diff --git a/module/zfs/vdev.c b/module/zfs/vdev.c index 6af61cdcd..e41e79ab8 100644 --- a/module/zfs/vdev.c +++ b/module/zfs/vdev.c @@ -229,7 +229,7 @@ vdev_default_xlate(vdev_t *vd, const range_seg64_t *in, range_seg64_t *res) /* * Derive the enumerated allocation bias from string input. - * String origin is either the per-vdev zap or zpool(1M). + * String origin is either the per-vdev zap or zpool(8). */ static vdev_alloc_bias_t vdev_derive_alloc_bias(const char *bias) diff --git a/module/zfs/zio.c b/module/zfs/zio.c index 8a8fbccd7..260e88b0b 100644 --- a/module/zfs/zio.c +++ b/module/zfs/zio.c @@ -1272,7 +1272,7 @@ zio_claim(zio_t *pio, spa_t *spa, uint64_t txg, const blkptr_t *bp, ASSERT3U(spa->spa_uberblock.ub_rootbp.blk_birth, <, spa_min_claim_txg(spa)); ASSERT(txg == spa_min_claim_txg(spa) || txg == 0); - ASSERT(!BP_GET_DEDUP(bp) || !spa_writeable(spa)); /* zdb(1M) */ + ASSERT(!BP_GET_DEDUP(bp) || !spa_writeable(spa)); /* zdb(8) */ zio = zio_create(pio, spa, txg, bp, NULL, BP_GET_PSIZE(bp), BP_GET_PSIZE(bp), done, private, ZIO_TYPE_CLAIM, ZIO_PRIORITY_NOW, diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_002_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_002_pos.ksh index c88e30041..6e293ca63 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_002_pos.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_copies/zfs_copies_002_pos.ksh @@ -92,7 +92,7 @@ for val in 1 2 3; do check_used $used $val done -log_note "Verify df(1M) can correctly display the space charged." +log_note "Verify df(1) can correctly display the space charged." for val in 1 2 3; do if is_freebsd; then used=`df -m /$TESTPOOL/fs_$val | grep $TESTPOOL/fs_$val \ -- 2.39.5