diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2021-04-14 10:49:10 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2021-04-14 10:51:51 +0000 |
| commit | 6db169e920810bf1d7e9bd2fad5da92bfb696677 (patch) | |
| tree | f0150cc8730eb3e32d0462e6546a176a9eba3b19 /sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c | |
| parent | 6678e75e4ff9026357950e97964e901d807578a5 (diff) | |
| parent | d76d37d9c3f33de9155c16f3b1eceb288c0702a0 (diff) | |
| download | src-6db169e920810bf1d7e9bd2fad5da92bfb696677.tar.gz src-6db169e920810bf1d7e9bd2fad5da92bfb696677.zip | |
zfs: merge openzfs/zfs@3522f57b6 (master)
Notable upstream pull request merges:
#11742 When specifying raidz vdev name, parity count should match
#11744 Use a helper function to clarify gang block size
#11771 Support running FreeBSD buildworld on Arm-based macOS hosts
This is the last update that will be MFCed into stable/13.
From now on, the tracking of OpenZFS branches will be different:
- main continues tracking openzfs/zfs/master
- stable/13 is going to track openzfs/zfs/zfs-2.1-release
Obtained from: OpenZFS
MFC after: 1 week
Diffstat (limited to 'sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c')
| -rw-r--r-- | sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c b/sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c index 47418b3237bb..4598e87f2921 100644 --- a/sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c +++ b/sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c @@ -48,7 +48,6 @@ #include <sys/mount.h> #include <pwd.h> #include <grp.h> -#include <stddef.h> #include <ucred.h> #ifdef HAVE_IDMAP #include <idmap.h> @@ -66,7 +65,6 @@ #include "zfs_namecheck.h" #include "zfs_prop.h" #include "libzfs_impl.h" -#include "libzfs.h" #include "zfs_deleg.h" static int userquota_propname_decode(const char *propname, boolean_t zoned, |