diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2022-09-21 12:17:13 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2022-09-21 12:17:13 +0000 |
| commit | c7046f76c2c027b00c0e6ba57cfd28f1a78f5e23 (patch) | |
| tree | 2c7012fec43602bc4e039c93c09acb858ed69c95 /sys/contrib/openzfs/lib/libshare/nfs.c | |
| parent | 440217b0af5ffa08086829f5902b01a92e7a6790 (diff) | |
| parent | c629f0bf62e351355716f9870d6c2e377584b016 (diff) | |
| download | src-c7046f76c2c027b00c0e6ba57cfd28f1a78f5e23.tar.gz src-c7046f76c2c027b00c0e6ba57cfd28f1a78f5e23.zip | |
zfs: merge openzfs/zfs@c629f0bf6
Notable upstream pull request merges:
#13725 Fix BLAKE3 tuneable and module loading on Linux and FreeBSD
#13756 FreeBSD: Organize sysctls
#13773 FreeBSD: add kqfilter support for zvol cdev
#13781 Importing from cachefile can trip assertion
#13794 Apply arc_shrink_shift to ARC above arc_c_min
#13798 Improve too large physical ashift handling
#13799 Revert "Avoid panic with recordsize > 128k, raw sending and
no large_blocks"
#13802 Add zfs.sync.snapshot_rename
#13831 zfs_enter rework
#13855 zfs recv hangs if max recordsize is less than received
recordsize
Obtained from: OpenZFS
OpenZFS commit: c629f0bf62e351355716f9870d6c2e377584b016
Diffstat (limited to 'sys/contrib/openzfs/lib/libshare/nfs.c')
| -rw-r--r-- | sys/contrib/openzfs/lib/libshare/nfs.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sys/contrib/openzfs/lib/libshare/nfs.c b/sys/contrib/openzfs/lib/libshare/nfs.c index 161bbfb0ceb9..bbaea93fca5c 100644 --- a/sys/contrib/openzfs/lib/libshare/nfs.c +++ b/sys/contrib/openzfs/lib/libshare/nfs.c @@ -28,6 +28,7 @@ #include <stdio.h> #include <errno.h> #include <libshare.h> +#include <unistd.h> #include "nfs.h" @@ -281,6 +282,17 @@ fullerr: return (error); } +void +nfs_reset_shares(const char *lockfile, const char *exports) +{ + int nfs_lock_fd = -1; + + if (nfs_exports_lock(lockfile, &nfs_lock_fd) == 0) { + (void) ! truncate(exports, 0); + nfs_exports_unlock(lockfile, &nfs_lock_fd); + } +} + static boolean_t nfs_is_shared_cb(void *userdata, char *line, boolean_t found_mountpoint) { |