diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2022-01-22 22:05:15 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2022-01-22 22:05:15 +0000 |
| commit | e92ffd9b626833ebdbf2742c8ffddc6cd94b963e (patch) | |
| tree | e0930ac4f07626135f89cb94535ff2f1a9fe8390 /sys/contrib/openzfs/module/zfs/dsl_dir.c | |
| parent | 3c3df3660072cd50b44aa72cbe23b0ec3341aa26 (diff) | |
| parent | 17b2ae0b24d487fdda2ef1098ec26fa7f79a61f6 (diff) | |
| download | src-e92ffd9b626833ebdbf2742c8ffddc6cd94b963e.tar.gz src-e92ffd9b626833ebdbf2742c8ffddc6cd94b963e.zip | |
zfs: merge openzfs/zfs@17b2ae0b2 (master) into main
Notable upstream pull request merges:
#12766 Fix error propagation from lzc_send_redacted
#12805 Updated the lz4 decompressor
#12851 FreeBSD: Provide correct file generation number
#12857 Verify dRAID empty sectors
#12874 FreeBSD: Update argument types for VOP_READDIR
#12896 Reduce number of arc_prune threads
#12934 FreeBSD: Fix zvol_*_open() locking
#12947 lz4: Cherrypick fix for CVE-2021-3520
#12961 FreeBSD: Fix leaked strings in libspl mnttab
#12964 Fix handling of errors from dmu_write_uio_dbuf() on FreeBSD
#12981 Introduce a flag to skip comparing the local mac when raw sending
#12985 Avoid memory allocations in the ARC eviction thread
Obtained from: OpenZFS
OpenZFS commit: 17b2ae0b24d487fdda2ef1098ec26fa7f79a61f6
Diffstat (limited to 'sys/contrib/openzfs/module/zfs/dsl_dir.c')
| -rw-r--r-- | sys/contrib/openzfs/module/zfs/dsl_dir.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/contrib/openzfs/module/zfs/dsl_dir.c b/sys/contrib/openzfs/module/zfs/dsl_dir.c index 84caace4dbab..bd5e0c2f627c 100644 --- a/sys/contrib/openzfs/module/zfs/dsl_dir.c +++ b/sys/contrib/openzfs/module/zfs/dsl_dir.c @@ -764,6 +764,8 @@ dsl_enforce_ds_ss_limits(dsl_dir_t *dd, zfs_prop_t prop, */ if (secpolicy_zfs_proc(cr, proc) == 0) return (ENFORCE_NEVER); +#else + (void) proc; #endif if ((obj = dsl_dir_phys(dd)->dd_head_dataset_obj) == 0) @@ -1896,10 +1898,10 @@ typedef struct dsl_valid_rename_arg { int nest_delta; } dsl_valid_rename_arg_t; -/* ARGSUSED */ static int dsl_valid_rename(dsl_pool_t *dp, dsl_dataset_t *ds, void *arg) { + (void) dp; dsl_valid_rename_arg_t *dvra = arg; char namebuf[ZFS_MAX_DATASET_NAME_LEN]; @@ -2396,6 +2398,7 @@ dsl_dir_activity_in_progress(dsl_dir_t *dd, dsl_dataset_t *ds, * The delete queue is ZPL specific, and libzpool doesn't have * it. It doesn't make sense to wait for it. */ + (void) ds; *in_progress = B_FALSE; break; #endif |