diff options
author | Martin Matuska <mm@FreeBSD.org> | 2025-01-11 09:00:12 +0000 |
---|---|---|
committer | Martin Matuska <mm@FreeBSD.org> | 2025-01-11 09:13:41 +0000 |
commit | dd21556857e8d40f66bf5ad54754d9d52669ebf7 (patch) | |
tree | 09a3fd923a08c190389e3be3989bcea53c26ecba /sys/contrib/openzfs/cmd | |
parent | 3ce003c8b6151f7764b7934de11c789d6b84ee5c (diff) | |
parent | b8e09c7007a0733a497aebe734cb8ed23a0415ae (diff) |
zfs: merge openzfs/zfs@b8e09c700
Notable upstream pull request merges:
#16851 19a04e5ad BRT: Check bv_mos_entries in brt_entry_lookup()
#16854 6c9b4f18d Fix DR_OVERRIDDEN use-after-free race in dbuf_sync_leaf
#16855 fbea92432 flush: don't report flush error when disabling flush
support
#16862 ecc0970e3 backtrace: fix off-by-one on string output
#16864 939e0237c Too many vdev probe errors should suspend pool
#16868 ff6266ee9 Fix use-afer-free regression in RAIDZ expansion
#16871 acda137d8 simd_stat: fix undefined CONFIG_KERNEL_MODE_NEON error
on armel
#16877 219a89cbb Skip iterating over snapshots for share properties
#16881 ab7cbbe78 zprop: fix value help for ZPOOL_PROP_CAPACITY
#16883 f00a57a78 zfs_main: fix alignment on props usage output
#16887 -multiple userprops: make clearing pool & vdev userprops work
the same
#16888 c37a2ddaa microzap: set hard upper limit of 1M
#16890 1acd24696 Fix readonly check for vdev user properties
#16901 9dd5fe109 zvol: implement platform-independent part of block cloning
#16909 54126fdb5 set zfs_arc_shrinker_limit to 0 by default
#16912 25238baad Add missing zfs_exit() when snapdir is disabled
#16918 478b09577 zfs_vnops_os.c: fallocate is valid but not supported
on FreeBSD
#16921 c02e1cf05 vdev_open: clear async remove flag after reopen
#16923 dc0324bfa fix: make zfs_strerror really thread-safe and portable
Obtained from: OpenZFS
OpenZFS commit: b8e09c7007a0733a497aebe734cb8ed23a0415ae
Diffstat (limited to 'sys/contrib/openzfs/cmd')
-rw-r--r-- | sys/contrib/openzfs/cmd/zfs/zfs_main.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/sys/contrib/openzfs/cmd/zfs/zfs_main.c b/sys/contrib/openzfs/cmd/zfs/zfs_main.c index a3cdb63016bf..0d3eec452c4c 100644 --- a/sys/contrib/openzfs/cmd/zfs/zfs_main.c +++ b/sys/contrib/openzfs/cmd/zfs/zfs_main.c @@ -500,7 +500,7 @@ usage_prop_cb(int prop, void *cb) { FILE *fp = cb; - (void) fprintf(fp, "\t%-15s ", zfs_prop_to_name(prop)); + (void) fprintf(fp, "\t%-22s ", zfs_prop_to_name(prop)); if (zfs_prop_readonly(prop)) (void) fprintf(fp, " NO "); @@ -561,40 +561,40 @@ usage(boolean_t requested) (void) fprintf(fp, "%s", gettext("\nThe following properties are supported:\n")); - (void) fprintf(fp, "\n\t%-14s %s %s %s\n\n", + (void) fprintf(fp, "\n\t%-21s %s %s %s\n\n", "PROPERTY", "EDIT", "INHERIT", "VALUES"); /* Iterate over all properties */ (void) zprop_iter(usage_prop_cb, fp, B_FALSE, B_TRUE, ZFS_TYPE_DATASET); - (void) fprintf(fp, "\t%-15s ", "userused@..."); + (void) fprintf(fp, "\t%-22s ", "userused@..."); (void) fprintf(fp, " NO NO <size>\n"); - (void) fprintf(fp, "\t%-15s ", "groupused@..."); + (void) fprintf(fp, "\t%-22s ", "groupused@..."); (void) fprintf(fp, " NO NO <size>\n"); - (void) fprintf(fp, "\t%-15s ", "projectused@..."); + (void) fprintf(fp, "\t%-22s ", "projectused@..."); (void) fprintf(fp, " NO NO <size>\n"); - (void) fprintf(fp, "\t%-15s ", "userobjused@..."); + (void) fprintf(fp, "\t%-22s ", "userobjused@..."); (void) fprintf(fp, " NO NO <size>\n"); - (void) fprintf(fp, "\t%-15s ", "groupobjused@..."); + (void) fprintf(fp, "\t%-22s ", "groupobjused@..."); (void) fprintf(fp, " NO NO <size>\n"); - (void) fprintf(fp, "\t%-15s ", "projectobjused@..."); + (void) fprintf(fp, "\t%-22s ", "projectobjused@..."); (void) fprintf(fp, " NO NO <size>\n"); - (void) fprintf(fp, "\t%-15s ", "userquota@..."); + (void) fprintf(fp, "\t%-22s ", "userquota@..."); (void) fprintf(fp, "YES NO <size> | none\n"); - (void) fprintf(fp, "\t%-15s ", "groupquota@..."); + (void) fprintf(fp, "\t%-22s ", "groupquota@..."); (void) fprintf(fp, "YES NO <size> | none\n"); - (void) fprintf(fp, "\t%-15s ", "projectquota@..."); + (void) fprintf(fp, "\t%-22s ", "projectquota@..."); (void) fprintf(fp, "YES NO <size> | none\n"); - (void) fprintf(fp, "\t%-15s ", "userobjquota@..."); + (void) fprintf(fp, "\t%-22s ", "userobjquota@..."); (void) fprintf(fp, "YES NO <size> | none\n"); - (void) fprintf(fp, "\t%-15s ", "groupobjquota@..."); + (void) fprintf(fp, "\t%-22s ", "groupobjquota@..."); (void) fprintf(fp, "YES NO <size> | none\n"); - (void) fprintf(fp, "\t%-15s ", "projectobjquota@..."); + (void) fprintf(fp, "\t%-22s ", "projectobjquota@..."); (void) fprintf(fp, "YES NO <size> | none\n"); - (void) fprintf(fp, "\t%-15s ", "written@<snap>"); + (void) fprintf(fp, "\t%-22s ", "written@<snap>"); (void) fprintf(fp, " NO NO <size>\n"); - (void) fprintf(fp, "\t%-15s ", "written#<bookmark>"); + (void) fprintf(fp, "\t%-22s ", "written#<bookmark>"); (void) fprintf(fp, " NO NO <size>\n"); (void) fprintf(fp, gettext("\nSizes are specified in bytes " |