diff options
| author | Sylvestre Gallon <syl@cvs.openbsd.org> | 2013-11-01 18:16:23 +0000 |
|---|---|---|
| committer | Sylvestre Gallon <syl@cvs.openbsd.org> | 2013-11-01 18:16:23 +0000 |
| commit | 383179ed5c2812ac937ff8637faea8f4fe717969 (patch) | |
| tree | 82cf0857d8408cdb31d6dce66180b033df6552a7 | |
| parent | 9f8d9e9e872d653e499edba16f5920c2dfe198d7 (diff) | |
Add missing bitfields needed by gvfs.
Bump pkg_config version to 2.8.0
ok ajacoutot@
| -rw-r--r-- | lib/libfuse/fuse.h | 41 | ||||
| -rw-r--r-- | lib/libfuse/fuse_private.h | 4 |
2 files changed, 32 insertions, 13 deletions
diff --git a/lib/libfuse/fuse.h b/lib/libfuse/fuse.h index 9db30fb992e..ebcc4842c94 100644 --- a/lib/libfuse/fuse.h +++ b/lib/libfuse/fuse.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fuse.h,v 1.7 2013/07/05 11:08:15 syl Exp $ */ +/* $OpenBSD: fuse.h,v 1.8 2013/11/01 18:16:22 syl Exp $ */ /* * Copyright (c) 2013 Sylvestre Gallon <ccna.syl@gmail.com> * @@ -34,24 +34,43 @@ struct fuse_args; struct fuse_session; struct fuse_file_info { - int32_t flags; /* open(2) flags */ - uint32_t fh_old; /* old file handle */ - int32_t writepage; - uint32_t direct_io:1; - uint32_t keep_cache:1; - uint32_t flush:1; - uint32_t __padd:29; - uint64_t fh; /* file handle */ - uint64_t lock_owner; + int32_t flags; /* open(2) flags */ + uint32_t fh_old; /* old file handle */ + int32_t writepage; + uint32_t direct_io:1; + uint32_t keep_cache:1; + uint32_t flush:1; + uint32_t nonseekable:1; + uint32_t __padd:27; + uint32_t flock_release : 1; + uint64_t fh; /* file handle */ + uint64_t lock_owner; }; +/* unused but needed for gvfs compilation */ +#define FUSE_CAP_ASYNC_READ (1 << 0) +#define FUSE_CAP_POSIX_LOCKS (1 << 1) +#define FUSE_CAP_ATOMIC_O_TRUNC (1 << 3) +#define FUSE_CAP_EXPORT_SUPPORT (1 << 4) +#define FUSE_CAP_BIG_WRITES (1 << 5) +#define FUSE_CAP_DONT_MASK (1 << 6) +#define FUSE_CAP_SPLICE_WRITE (1 << 7) +#define FUSE_CAP_SPLICE_MOVE (1 << 8) +#define FUSE_CAP_SPLICE_READ (1 << 9) +#define FUSE_CAP_FLOCK_LOCKS (1 << 10) +#define FUSE_CAP_IOCTL_DIR (1 << 11) + struct fuse_conn_info { uint32_t proto_major; uint32_t proto_minor; uint32_t async_read; uint32_t max_write; uint32_t max_readahead; - uint32_t reserved[27]; + uint32_t capable; + uint32_t want; + uint32_t max_background; + uint32_t congestion_threshold; + uint32_t reserved[23]; }; struct fuse_context { diff --git a/lib/libfuse/fuse_private.h b/lib/libfuse/fuse_private.h index cd813a0ccfb..865edc5653c 100644 --- a/lib/libfuse/fuse_private.h +++ b/lib/libfuse/fuse_private.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fuse_private.h,v 1.5 2013/10/07 18:41:01 syl Exp $ */ +/* $OpenBSD: fuse_private.h,v 1.6 2013/11/01 18:16:22 syl Exp $ */ /* * Copyright (c) 2013 Sylvestre Gallon <ccna.syl@gmail.com> * @@ -111,7 +111,7 @@ void *dict_set(struct dict *, const char *, void *); void *dict_get(struct dict *, const char *);; void *dict_pop(struct dict *, const char *); -#define FUSE_VERSION_PKG_INFO "2.6.9" +#define FUSE_VERSION_PKG_INFO "2.8.0" #define unused __attribute__ ((unused)) #endif /* _FUSE_SUBR_ */ |