diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-01-07 13:03:45 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-01-07 13:03:45 +0000 |
| commit | 360d81ba7f68f05c3c7101fce818b638a62ce8ad (patch) | |
| tree | 518f5a42c0126cfe6a350da1c056fccd793b86a5 /usr/src/cmd | |
| parent | eb9873bb7b9650b2e1eb9db5b52eb6d2345c9392 (diff) | |
| parent | 5ff8cfa92ec8ea0f8593ad21aa2a04829b0ef5ea (diff) | |
| download | illumos-joyent-release-20150108.tar.gz | |
[illumos-gate merge]20150108release-20150108
commit 5ff8cfa92ec8ea0f8593ad21aa2a04829b0ef5ea
5410 Document -S option to zfs inherit
5412 Mention -S option when zfs inherit fails on quota
commit bc9014e6a81272073b9854d9f65dd59e18d18c35
5056 ZFS deadlock on db_mtx and dn_holds
Diffstat (limited to 'usr/src/cmd')
| -rw-r--r-- | usr/src/cmd/zfs/zfs_main.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/usr/src/cmd/zfs/zfs_main.c b/usr/src/cmd/zfs/zfs_main.c index a2828db3e9..80af9e0361 100644 --- a/usr/src/cmd/zfs/zfs_main.c +++ b/usr/src/cmd/zfs/zfs_main.c @@ -1957,9 +1957,13 @@ zfs_do_inherit(int argc, char **argv) if (prop == ZFS_PROP_QUOTA || prop == ZFS_PROP_RESERVATION || prop == ZFS_PROP_REFQUOTA || - prop == ZFS_PROP_REFRESERVATION) + prop == ZFS_PROP_REFRESERVATION) { (void) fprintf(stderr, gettext("use 'zfs set " "%s=none' to clear\n"), propname); + (void) fprintf(stderr, gettext("use 'zfs " + "inherit -S %s' to revert to received " + "value\n"), propname); + } return (1); } if (received && (prop == ZFS_PROP_VOLSIZE || |