diff options
| author | pho <pho@NetBSD.org> | 2022-01-22 07:57:30 +0000 |
|---|---|---|
| committer | pho <pho@NetBSD.org> | 2022-01-22 07:57:30 +0000 |
| commit | d15edff82e327293be5b1aa0c81a9dc084d7ff85 (patch) | |
| tree | a56f9f3e8e8c2d288616239ce8d991f874682f01 /lib/librefuse | |
| parent | 6dd72ff4091768d03bdc474eaa9c511476acb1d8 (diff) | |
lib/librefuse: Add support for legacy types and functions
Diffstat (limited to 'lib/librefuse')
| -rw-r--r-- | lib/librefuse/fuse.h | 6 | ||||
| -rw-r--r-- | lib/librefuse/refuse.c | 21 | ||||
| -rw-r--r-- | lib/librefuse/refuse/Makefile.inc | 4 | ||||
| -rw-r--r-- | lib/librefuse/refuse/legacy.c | 54 | ||||
| -rw-r--r-- | lib/librefuse/refuse/legacy.h | 93 |
5 files changed, 173 insertions, 5 deletions
diff --git a/lib/librefuse/fuse.h b/lib/librefuse/fuse.h index 9b305fe9f85..3b25d92a2a8 100644 --- a/lib/librefuse/fuse.h +++ b/lib/librefuse/fuse.h @@ -1,4 +1,4 @@ -/* $NetBSD: fuse.h,v 1.27 2022/01/22 07:56:16 pho Exp $ */ +/* $NetBSD: fuse.h,v 1.28 2022/01/22 07:57:30 pho Exp $ */ /* * Copyright © 2007 Alistair Crooks. All rights reserved. @@ -31,6 +31,7 @@ #define FUSE_H_ 20211204 #include <refuse/buf.h> +#include <refuse/legacy.h> #include <refuse/poll.h> #include <refuse/session.h> #include <sys/cdefs.h> @@ -110,7 +111,6 @@ struct fuse_args { */ #define FUSE_ARGS_INIT(argc, argv) { argc, argv, 0 } -typedef struct puffs_fuse_dirh *fuse_dirh_t; typedef int (*fuse_fill_dir_t)(void *, const char *, const struct stat *, off_t); typedef int (*fuse_dirfil_t)(fuse_dirh_t, const char *, int, ino_t); @@ -166,6 +166,8 @@ struct fuse_operations { struct fuse *fuse_new(struct fuse_args *, const struct fuse_operations *, size_t, void *); +/* Invalidate cache for a given path. Appeared on FUSE 3.2. */ +int fuse_invalidate_path(struct fuse *fuse, const char *path); int fuse_mount(struct fuse *, const char *); void fuse_unmount(struct fuse *); diff --git a/lib/librefuse/refuse.c b/lib/librefuse/refuse.c index 3f721b9550c..705f536174c 100644 --- a/lib/librefuse/refuse.c +++ b/lib/librefuse/refuse.c @@ -1,4 +1,4 @@ -/* $NetBSD: refuse.c,v 1.104 2022/01/22 07:53:06 pho Exp $ */ +/* $NetBSD: refuse.c,v 1.105 2022/01/22 07:57:30 pho Exp $ */ /* * Copyright © 2007 Alistair Crooks. All rights reserved. @@ -31,7 +31,7 @@ #include <sys/cdefs.h> #if !defined(lint) -__RCSID("$NetBSD: refuse.c,v 1.104 2022/01/22 07:53:06 pho Exp $"); +__RCSID("$NetBSD: refuse.c,v 1.105 2022/01/22 07:57:30 pho Exp $"); #endif /* !lint */ /* We emit a compiler warning for anyone including <fuse.h> without @@ -1392,7 +1392,24 @@ fuse_unmount_compat22(const char *mp) } int +fuse_invalidate_path(struct fuse *fuse __attribute__((__unused__)), + const char *path __attribute__((__unused__))) +{ + /* ReFUSE doesn't cache anything at the moment. No need to do + * anything. */ + return -ENOENT; +} + +int fuse_version(void) { return FUSE_VERSION; } + +/* This is a legacy function that has been removed from the FUSE API, + * but is defined here because it needs to access refuse_opts. */ +int +fuse_is_lib_option(const char *opt) +{ + return fuse_opt_match(refuse_opts, opt); +} diff --git a/lib/librefuse/refuse/Makefile.inc b/lib/librefuse/refuse/Makefile.inc index 478e7bf6341..0e8ae3d9fe2 100644 --- a/lib/librefuse/refuse/Makefile.inc +++ b/lib/librefuse/refuse/Makefile.inc @@ -1,11 +1,13 @@ -# $NetBSD: Makefile.inc,v 1.3 2022/01/22 07:56:16 pho Exp $ +# $NetBSD: Makefile.inc,v 1.4 2022/01/22 07:57:30 pho Exp $ .PATH: ${.CURDIR}/refuse SRCS+= buf.c +SRCS+= legacy.c SRCS+= poll.c SRCS+= session.c INCS+= refuse/buf.h +INCS+= refuse/legacy.h INCS+= refuse/poll.h INCS+= refuse/session.h diff --git a/lib/librefuse/refuse/legacy.c b/lib/librefuse/refuse/legacy.c new file mode 100644 index 00000000000..114039a4a3b --- /dev/null +++ b/lib/librefuse/refuse/legacy.c @@ -0,0 +1,54 @@ +/* $NetBSD: legacy.c,v 1.1 2022/01/22 07:57:30 pho Exp $ */ + +/* + * Copyright (c) 2021 The NetBSD Foundation, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS + * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE + * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include <sys/cdefs.h> +#if !defined(lint) +__RCSID("$NetBSD: legacy.c,v 1.1 2022/01/22 07:57:30 pho Exp $"); +#endif /* !lint */ + +#include <errno.h> +#include <fuse_internal.h> + +int +fuse_invalidate(struct fuse *fuse __attribute__((__unused__)), + const char *path __attribute__((__unused__))) +{ + int res = fuse_invalidate_path(fuse, path); + + switch (res) { + case -ENOENT: + /* There was no entry to be invalidated. This isn't an + * error. */ + return 0; + default: + return res; + } +} diff --git a/lib/librefuse/refuse/legacy.h b/lib/librefuse/refuse/legacy.h new file mode 100644 index 00000000000..c791f01bdbf --- /dev/null +++ b/lib/librefuse/refuse/legacy.h @@ -0,0 +1,93 @@ +/* $NetBSD: legacy.h,v 1.1 2022/01/22 07:57:30 pho Exp $ */ + +/* + * Copyright (c) 2021 The NetBSD Foundation, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS + * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE + * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +#if !defined(_FUSE_LEGACY_H_) +#define _FUSE_LEGACY_H_ + +#include <sys/fstypes.h> + +/* Legacy data types and functions that had once existed but have been + * removed from the FUSE API. */ + +#if !defined(FUSE_H_) +# error Do not include this header directly. Include <fuse.h> instead. +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +/* statfs structure used by FUSE < 1.9. On 2.1 it's been replaced with + * "struct statfs" and later replaced again with struct statvfs on + * 2.5. */ +struct fuse_statfs { + long block_size; + long blocks; + long blocks_free; + long files; + long files_free; + long namelen; +}; + +/* Linux-specific struct statfs; used by FUSE >= 2.1 && < 2.5. */ +struct statfs { + long f_type; + long f_bsize; + fsblkcnt_t f_blocks; + fsblkcnt_t f_bfree; + fsblkcnt_t f_bavail; + fsfilcnt_t f_files; + fsfilcnt_t f_ffree; + fsid_t f_fsid; + long f_namelen; + long f_frsize; + long f_flags; +}; + +/* Handle for a getdir() operation. Removed as of FUSE 3.0. */ +typedef void *fuse_dirh_t; + +/* Enable debugging output. Removed on FUSE 3.0. */ +#define FUSE_DEBUG (1 << 1) + +/* Invalidate cached data of a file. Added on FUSE 1.9 and removed on + * FUSE 3.0. Not to be confused with fuse_invalidate_path() appeared + * on FUSE 3.2. */ +int fuse_invalidate(struct fuse *f, const char *path); + +/* Check whether a mount option should be passed to the kernel or the + * library. Added on FUSE 1.9 and removed on FUSE 3.0. */ +int fuse_is_lib_option(const char *opt); + +#ifdef __cplusplus +} +#endif + +#endif |
