diff options
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/Manifest.gz | bin | 22187 -> 22188 bytes | |||
| -rw-r--r-- | sys-fs/btrfs-progs/Manifest | 2 | ||||
| -rw-r--r-- | sys-fs/btrfs-progs/btrfs-progs-4.17.ebuild | 117 | ||||
| -rw-r--r-- | sys-fs/fuse4bsd/Manifest | 2 | ||||
| -rw-r--r-- | sys-fs/fuse4bsd/files/fuse4bsd-0.3.0-gcc4.patch | 12 | ||||
| -rw-r--r-- | sys-fs/fuse4bsd/files/fuse4bsd-0.3.0-ports.patch | 491 |
6 files changed, 119 insertions, 505 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz Binary files differindex b53f6e2eff15..cee4ec0910e3 100644 --- a/sys-fs/Manifest.gz +++ b/sys-fs/Manifest.gz diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest index aac5a6b74dfc..8c79ae6ceaa8 100644 --- a/sys-fs/btrfs-progs/Manifest +++ b/sys-fs/btrfs-progs/Manifest @@ -8,6 +8,7 @@ DIST btrfs-progs-v4.14.1.tar.xz 1926492 BLAKE2B 35575946c1de9cb81f1aed2a5be24331 DIST btrfs-progs-v4.15.1.tar.xz 1931820 BLAKE2B 00c4b9f6ec2039ad680cd625e5ece1cd306b8eaa4572f262cd2272c9d1e03923834ec7af7e59afc9e931cf95d224aea883cc544ba8e26de03119d85c67f19b64 SHA512 6e6a9799f6716bbf772d5f0c8069579815060db20d30807e12948e7274448bca09a12c385ea05a95afc23722d12067a8d99623ea0091dca8ae75ea646aa84b88 DIST btrfs-progs-v4.16.1.tar.xz 1980696 BLAKE2B 85854fd025c92bd31c957623b78ad72efd536fc8c9d72cc7ad65b9a435b3d57405208e355a86d95ea46ed0179a04e34c3693c4e465e7d6a8edfacdbd185e1421 SHA512 9f0e8c593a10c1c09749ccc00f470ba44d4357fabca8d89ce5891ab0d9cd70f1356f1c6677288019387a6b3b3746431537da205627791a35955bb8bed33d807e DIST btrfs-progs-v4.16.tar.xz 1980420 BLAKE2B 979dffe990ea92f44582fa29f634ba4fa8e75917c9907ae4d4c5a72f6623450b29b6b0f3c40423711bc11856bc7d7775fb134fc5210e092d2c61ebe2165352cc SHA512 3d794f890a7772c27c285410892b9de4c0629f6de6cd96e42d1e25c9263dd519d14428eaba75a3595f2d03a1154ffbbfe6a02449d7527a2ab6a1911a8736358e +DIST btrfs-progs-v4.17.tar.xz 2002792 BLAKE2B beb63b0dcbd7f84b9ec95338d50c13e410fd967dcee56449328eb40d0ed89def4136675ffc86fc693d961175e74f11bf89f725e101e5cf35e7cbf2e228887d77 SHA512 1d238ea6c75f2493f0c5f3995bcfd592e945e20e407a71d962a8ce534fe829f5aa139c0e2d2cb497435de6ddf5c29f0e9dfb900419cc0c9d91cac3ae8154ee75 DIST btrfs-progs-v4.4.1.tar.xz 1173248 BLAKE2B 8bf07a3bc3d24a3f641c2dc7a6353f186ebd98f7a633bdbc2689359e6204b3f1db76accee3e648634f319e26b57e6376c13fa31d39413908d0b2308e0ae28d0e SHA512 3086e2e0385d9e14edcfa25e1aee1ed98087dd5b91a66aa450786c932d79841b5c4ee3f9a40b8fdecee0ba1e386196b89679d28e58e4924ce66cd78c5e3c0d4a DIST btrfs-progs-v4.9.1.tar.xz 1476524 BLAKE2B 3fdd1c040fdf8083fcf5d4106db22112aaba59dd9a6ab8ad164302ec153a83151fbf88d84181dc849c296bb96ad883d4f7329bff111c67c19fdb814db5073fb2 SHA512 143f5c8863f3b9eff2e4ca2c750bb80ffe62f66d0c15d23e6f5bf75dab0133dcd3ff4d4c722360560de24b73e3da1222f265230d18de06d7bccd85ad2cb9a6a5 EBUILD btrfs-progs-3.16.2.ebuild 1257 BLAKE2B b243da6fc07eb44afbb5c4db272ba98c88a27f27afaf7740e2105c143fbc5ac7f6894c66feb931229a1da4eb5b7613418240ee1a051ebedf79d53d4b0e260fc5 SHA512 2321b579af3ee75282836090bc1c0fa71e2f80fa039a479ea71755674f09cacc18e269430e1617e4b1dadd2a9a80b6155cfd0cf2231b6f3ef6fd58f03934caf2 @@ -18,6 +19,7 @@ EBUILD btrfs-progs-4.14.1.ebuild 2481 BLAKE2B 3e4db698cb95fdcdb982b424364cced1aa EBUILD btrfs-progs-4.15.1.ebuild 2586 BLAKE2B a4f784458b56797d6018ed5bcc84d5270419c3507cc861af002ee7756420e864889414deb713f5f78154d7e0c84bf2ec63e2509ae62cc1b00560f85b37a4a9f8 SHA512 94662ed43680e269ad10be9209b59e5e882839d30ff28e6311420f6298d4e37aeff328ec889b66f661f61bae0b21d0541c79733521dec0b4b8cc0d0c8ab652dc EBUILD btrfs-progs-4.16.1.ebuild 2861 BLAKE2B cd4e072ef8183ff769336767957e2b9528b4c9811170f91758cfc296fde24d23077d72cb6fe44af4b75e6ce8510e5f8db2b54545b461a6d358d75fc1705a93af SHA512 edb7fbdc799d29430afb45d6249ff533079d7fe8b60be61e9601fe285a3b332ddce80cd36e50d1a92cfd12be683e57c2ddacffd0b3c52a716903429af3967f2c EBUILD btrfs-progs-4.16.ebuild 2915 BLAKE2B e9215110a23394a2aca7a9eb087b37c9d7968c793fe3d8b8f45728c12b84915e26e96dc6b1642469b44d1b00c623951cb08c8c6f663e4428ba708cca48b26488 SHA512 d15f0318d5abdedcc2939cffcf53ded96f32163fb00e24ee4b49891abfd88f5fc9588a767971a711ea13d8a9ed71977798fae1152c2a0821006a8202a3ff4675 +EBUILD btrfs-progs-4.17.ebuild 2861 BLAKE2B cd4e072ef8183ff769336767957e2b9528b4c9811170f91758cfc296fde24d23077d72cb6fe44af4b75e6ce8510e5f8db2b54545b461a6d358d75fc1705a93af SHA512 edb7fbdc799d29430afb45d6249ff533079d7fe8b60be61e9601fe285a3b332ddce80cd36e50d1a92cfd12be683e57c2ddacffd0b3c52a716903429af3967f2c EBUILD btrfs-progs-4.4.1.ebuild 2233 BLAKE2B 3e7ccb59be25264c1b95f7d2a2a21ddeb338508f8b9a9c060decb0ff4999e87bfd67e4e6d2f00d811b818f13ba75d38972235b8f1685d4d072b8473cbaaa6d43 SHA512 85038dfcffd849ffdd62239f275e63a2fc4ce693c140c598c89f3dc19c92fa5b72c61fef27192d46853f3bcf828aa7efb34e74949acbd919cb358e1a20654dcd EBUILD btrfs-progs-4.9.1.ebuild 2201 BLAKE2B ae5b75a334cce82b436846179ebfa2dea8c1e61c41636821ec85e07c67c1fcbbbf60ecc6cff41bff77ddb0bae82b8b83c411ceb9f2b765fecb043790305c2bfe SHA512 51c6ab63b8cb3c0d6c99eec8412136a51788307c53eacbef3a81045b9cb093b9aa1c7cf9c2422d66bbcc9b714981927cac681c9838b5851d3311a3d9d2e4e6c4 EBUILD btrfs-progs-9999.ebuild 2861 BLAKE2B cd4e072ef8183ff769336767957e2b9528b4c9811170f91758cfc296fde24d23077d72cb6fe44af4b75e6ce8510e5f8db2b54545b461a6d358d75fc1705a93af SHA512 edb7fbdc799d29430afb45d6249ff533079d7fe8b60be61e9601fe285a3b332ddce80cd36e50d1a92cfd12be683e57c2ddacffd0b3c52a716903429af3967f2c diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.17.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.17.ebuild new file mode 100644 index 000000000000..0936ade75910 --- /dev/null +++ b/sys-fs/btrfs-progs/btrfs-progs-4.17.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_{4,5,6} ) + +inherit bash-completion-r1 python-single-r1 + +libbtrfs_soname=0 + +if [[ ${PV} != 9999 ]]; then + MY_PV="v${PV/_/-}" + [[ "${PV}" = *_rc* ]] || \ + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" + S="${WORKDIR}"/${PN}-${MY_PV} +else + WANT_LIBTOOL=none + inherit autotools git-r3 + EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git" + EGIT_BRANCH="devel" +fi + +DESCRIPTION="Btrfs filesystem utilities" +HOMEPAGE="https://btrfs.wiki.kernel.org" + +LICENSE="GPL-2" +SLOT="0/${libbtrfs_soname}" +IUSE="+convert python reiserfs static static-libs +zstd" + +RESTRICT=test # tries to mount repared filesystems + +RDEPEND=" + dev-libs/lzo:2= + sys-apps/util-linux:0=[static-libs(+)?] + sys-libs/zlib:0= + convert? ( + sys-fs/e2fsprogs:0= + sys-libs/e2fsprogs-libs:0= + reiserfs? ( + >=sys-fs/reiserfsprogs-3.6.27 + ) + ) + python? ( ${PYTHON_DEPS} ) + zstd? ( app-arch/zstd:0= ) +" +DEPEND="${RDEPEND} + convert? ( sys-apps/acl ) + >=app-text/asciidoc-8.6.0 + app-text/docbook-xml-dtd:4.5 + app-text/xmlto + python? ( dev-python/setuptools[${PYTHON_USEDEP}] ) + static? ( + dev-libs/lzo:2[static-libs(+)] + sys-apps/util-linux:0[static-libs(+)] + sys-libs/zlib:0[static-libs(+)] + convert? ( + sys-fs/e2fsprogs:0[static-libs(+)] + sys-libs/e2fsprogs-libs:0[static-libs(+)] + reiserfs? ( + >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] + ) + ) + zstd? ( app-arch/zstd:0[static-libs(+)] ) + ) +" + +if [[ ${PV} == 9999 ]]; then + DEPEND+=" sys-devel/gnuconfig" +fi + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + if [[ ${PV} == 9999 ]]; then + AT_M4DIR=m4 eautoreconf + mkdir config || die + local automakedir="$(autotools_run_tool --at-output automake --print-libdir)" + [[ -e ${automakedir} ]] || die "Could not locate automake directory" + ln -s "${automakedir}"/install-sh config/install-sh || die + ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die + ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die + fi +} + +src_configure() { + local myeconfargs=( + --bindir="${EPREFIX}"/sbin + $(use_enable convert) + $(use_enable elibc_glibc backtrace) + $(use_enable python) + $(use_enable zstd) + --with-convert=ext2$(usex reiserfs ',reiserfs' '') + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + emake V=1 all $(usev static) +} + +src_install() { + local makeargs=( + $(usex python install_python '') + $(usex static-libs '' 'libs_static=') + $(usex static install-static '') + ) + emake V=1 DESTDIR="${D}" install "${makeargs[@]}" + newbashcomp btrfs-completion btrfs + use python && python_optimize +} diff --git a/sys-fs/fuse4bsd/Manifest b/sys-fs/fuse4bsd/Manifest index 5556765d2684..8b0d488622d5 100644 --- a/sys-fs/fuse4bsd/Manifest +++ b/sys-fs/fuse4bsd/Manifest @@ -1,5 +1,3 @@ -AUX fuse4bsd-0.3.0-gcc4.patch 432 BLAKE2B 52b0dacd9886900ef16f8a2bb2b99c3bfea3795d0a60b55f81c814161a01dc0a735a3288b6810e8d7cbffe01c1e0bb3a183c082825c30cb38f9b1a34aef6878f SHA512 edbd1ac4b7fc4ad81f6787edbe2d5202d3566f5b05c996bf65ab0bf97f69ce99fe14d42707c3a2852ac967082a3cfbf2688d4377b67221240b7d2af0f345b2fc -AUX fuse4bsd-0.3.0-ports.patch 13090 BLAKE2B 513a9779ab4c01563820069d7d57fee9d993ae1ad72dc745af68aef8a37957a731807a7bae96570da03847b9a2b49b025038c5ef490395866c31ac36e1a05aa1 SHA512 aae25a811ff987aa6beebccf72bda7309552ffa08402d0ae2d1c06c40f5b689d00ee4702cbff0cfcf874d43dadddc94cd088444645fef87bc59a91ac66f680cc AUX fuse4bsd-0.3.9_pre1-fbsd91.patch 508 BLAKE2B c8b61e8cb6a4337657a6ae4c1d25d380d350584654e8e1d6ce8d2a2f32140640c0be2c4a971055943ce960c306f6c93da7608d213e9fd3a4c9eb99bdffafcc76 SHA512 9a02ef10ffc1134470a807c7d475c56ac7139835593e06c66a2ed182f39e7488468035ae940a6ef0551e6d888689969d5838733e0fcd398fc524e1de9fd1e8b3 AUX fuse4bsd-0.3.9_pre1-ports.patch 12209 BLAKE2B 2a0bfd4c2028b30d82d82787b1a444302d2a89f14cf68ccc33f20694bd27ae0ff07488401bf99eae424cbbbfb291ea5f4e5e0dff2c505d9e57dc44f7738f683b SHA512 0d149e517bfa2b0260e86bda7f1d3f06c6328dd1803f72a1e823e91bb596e5f0a0bcf4fd00a70f574935eb96c515049001d8e7c42bc0893d81fb2e371fcef67c DIST 498acaef33b0.tar.gz 116035 BLAKE2B f5f7b3ded2e65422c9df771a62590e71803884ac8fbba5aabc67d1ddf7e2309e4b20d37ae43a64ca0ce46100963e68c57131c263291d0f747fe849ed65b05c0e SHA512 6427d888cea5b1519c4ae92ec8ec640535692c59dd8ca987a32574050239c9ff4cb92a4cf6b34f3c1363becdd9fd75c031f5db4bda34b298898466066740845a diff --git a/sys-fs/fuse4bsd/files/fuse4bsd-0.3.0-gcc4.patch b/sys-fs/fuse4bsd/files/fuse4bsd-0.3.0-gcc4.patch deleted file mode 100644 index ca1158e9fc1f..000000000000 --- a/sys-fs/fuse4bsd/files/fuse4bsd-0.3.0-gcc4.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur fuse4bsd-0.3.0.old/fuse_module/fuse.c fuse4bsd-0.3.0/fuse_module/fuse.c ---- fuse4bsd-0.3.0.old/fuse_module/fuse.c 2006-11-05 14:32:44.000000000 +0100 -+++ fuse4bsd-0.3.0/fuse_module/fuse.c 2006-11-05 14:33:43.000000000 +0100 -@@ -5971,7 +5971,7 @@ - extern struct cdevsw fmaster_cdevsw[5]; - static struct cdev *fmaster_dev[5]; - #endif --extern struct vfsconf fuse_vfsconf; -+static struct vfsconf fuse_vfsconf; - - - static void diff --git a/sys-fs/fuse4bsd/files/fuse4bsd-0.3.0-ports.patch b/sys-fs/fuse4bsd/files/fuse4bsd-0.3.0-ports.patch deleted file mode 100644 index a2c349919298..000000000000 --- a/sys-fs/fuse4bsd/files/fuse4bsd-0.3.0-ports.patch +++ /dev/null @@ -1,491 +0,0 @@ ---- fuse_module/fmaster.c Mon Jun 19 22:10:26 2006 +0200 -+++ fuse_module/fmaster.c Mon Jun 19 22:23:08 2006 +0200 -@@ -506,22 +506,22 @@ fuse_response_prettyprint(enum fuse_opco - case FUSE_FSYNCDIR: - //pp_buf(fresp); - break; --#if FUSE_HAS_GETLK -+#ifdef FUSE_HAS_GETLK - case FUSE_GETLK: - panic("FUSE_GETLK implementor has forgotten to define a response body format check"); - break; - #endif --#if FUSE_HAS_SETLK -+#ifdef FUSE_HAS_SETLK - case FUSE_SETLK: - panic("FUSE_SETLK implementor has forgotten to define a response body format check"); - break; - #endif --#if FUSE_HAS_SETLKW -+#ifdef FUSE_HAS_SETLKW - case FUSE_SETLKW: - panic("FUSE_SETLKW implementor has forgotten to define a response body format check"); - break; - #endif --#if FUSE_HAS_ACCESS -+#ifdef FUSE_HAS_ACCESS - case FUSE_ACCESS: - break; - #endif--- fuse_module/fuse.c.orig Wed Sep 27 15:49:47 2006 -+++ fuse_module/fuse.c Wed Sep 27 15:52:02 2006 -@@ -75,7 +75,7 @@ - }; - - --#if USE_OLD_CLONEHANDLER_API -+#ifdef USE_OLD_CLONEHANDLER_API - static void fusedev_clone(void *arg, char *name, int namelen, struct cdev **dev); - #else - static void fusedev_clone(void *arg, struct ucred *cred, char *name, int namelen, struct cdev **dev); -@@ -120,7 +120,7 @@ - __static void fuse_insert_message(struct fuse_ticket *tick); - __static fuse_handler_t fuse_standard_handler; - static fuse_handler_t fuse_fsync_handler; --#if FUSE_HAS_CREATE -+#ifdef FUSE_HAS_CREATE - static fuse_handler_t fuse_forgetful_handler; - #endif - -@@ -852,27 +852,27 @@ - case FUSE_FSYNCDIR: - err = blen == 0 ? 0 : EINVAL; - break; --#if FUSE_HAS_GETLK -+#ifdef FUSE_HAS_GETLK - case FUSE_GETLK: - panic("FUSE_GETLK implementor has forgotten to define a response body format check"); - break; - #endif --#if FUSE_HAS_SETLK -+#ifdef FUSE_HAS_SETLK - case FUSE_SETLK: - panic("FUSE_SETLK implementor has forgotten to define a response body format check"); - break; - #endif --#if FUSE_HAS_SETLKW -+#ifdef FUSE_HAS_SETLKW - case FUSE_SETLKW: - panic("FUSE_SETLKW implementor has forgotten to define a response body format check"); - break; - #endif --#if FUSE_HAS_ACCESS -+#ifdef FUSE_HAS_ACCESS - case FUSE_ACCESS: - err = blen == 0 ? 0 : EINVAL; - break; - #endif --#if FUSE_HAS_CREATE -+#ifdef FUSE_HAS_CREATE - case FUSE_CREATE: - err = blen == sizeof(struct fuse_entry_out) + sizeof(struct fuse_open_out) ? 0 : EINVAL; - break; -@@ -881,7 +881,7 @@ - panic("fuse opcodes out of sync"); - } - --#if _DEBUG2G -+#ifdef _DEBUG2G - if (err) - DEBUG2G("op %s (#%d) with body size %d: invalid body size\n", - (0 <= opcode && opcode <= fuse_opnames_entries) ? fuse_opnames[opcode] : "???", -@@ -904,7 +904,7 @@ - uint64_t nid, enum fuse_opcode op, size_t blen, - struct thread* td, struct ucred *cred) - { -- ihead->len = sizeof(ihead) + blen; /* actually not used by lib */ -+ ihead->len = sizeof(*ihead) + blen; /* actually not used by lib */ - ihead->unique = tick->unique; - ihead->nodeid = nid; - ihead->opcode = op; -@@ -988,7 +988,7 @@ - return (0); - } - --#if FUSE_HAS_CREATE -+#ifdef FUSE_HAS_CREATE - static int - fuse_forgetful_handler(struct fuse_callback_node *caliban, struct uio *uio) - { -@@ -1242,7 +1242,7 @@ - static int - fusedev_write(struct cdev *dev, struct uio *uio, int ioflag) - { --#if _DEBUG_MSGING -+#ifdef _DEBUG_MSGING - static int counter=0; - #endif - struct fuse_out_header *ohead; -@@ -1415,7 +1415,7 @@ - if ((err = fuse_callbn_wait_answer(&fdip->tick->callbn))) { - /* Uh-huh, we got interrupted... */ - --#if ! DONT_TRY_HARD_PREVENT_IO_IN_VAIN -+#ifndef DONT_TRY_HARD_PREVENT_IO_IN_VAIN - struct fuse_callback_node *fcallbn; - unsigned age; - #endif -@@ -1438,7 +1438,7 @@ - age = fdip->tick->age; - fuse_callbn_set_answered(&fdip->tick->callbn); - mtx_unlock(&fdip->tick->callbn.answer_mtx); --#if ! DONT_TRY_HARD_PREVENT_IO_IN_VAIN -+#ifndef DONT_TRY_HARD_PREVENT_IO_IN_VAIN - /* - * If we are willing to pay with one more locking, we - * can save on I/O by getting the device write handler -@@ -1662,7 +1662,7 @@ - /* static vop_pathconf_t fuse_pathconf; */ - static vfs_hash_cmp_t fuse_vnode_cmp; - static vfs_hash_cmp_t fuse_vnode_bgdrop_cmp; --#if FUSE_HAS_CREATE -+#ifdef FUSE_HAS_CREATE - static vfs_hash_cmp_t fuse_vnode_fgdrop_cmp; - #endif - /* static vfs_vget_t fuse_vget; */ -@@ -1683,7 +1683,7 @@ - static vop_lookup_t fuse_lookup; - static int iterate_filehandles(struct vnode *vp, struct thread *td, struct ucred *cred, fuse_metrics_t fmetr, void *param); - static fuse_metrics_t fuse_standard_metrics; --#if FUSE_HAS_CREATE -+#ifdef FUSE_HAS_CREATE - static __inline int create_filehandle(struct vnode *vp, struct thread *td, struct ucred *cred, int mode, struct fuse_dispatcher *fdip); - #endif - static struct fuse_filehandle *get_filehandle(struct vnode *vp, struct thread *td, struct ucred *cred, int mode, struct get_filehandle_param *gefhp); -@@ -1729,7 +1729,7 @@ - - static b_strategy_t fuse_bufstrategy; - --#if FUSE_HAS_CREATE -+#ifdef FUSE_HAS_CREATE - static vop_access_t fuse_germ_access; - #endif - -@@ -1773,7 +1773,7 @@ - .vop_unlock = fuse_unlock, - }; - --#if FUSE_HAS_CREATE -+#ifdef FUSE_HAS_CREATE - static struct vop_vector fuse_germ_vnops; - #endif - -@@ -2092,7 +2092,7 @@ - - if (! (fmnt->mntopts & FUSEFS_SECONDARY)) { - data->mp = mp; --#if ! REALTIME_TRACK_UNPRIVPROCDBG -+#ifndef REALTIME_TRACK_UNPRIVPROCDBG - fmnt->mntopts &= ~FUSEFS_UNPRIVPROCDBG; - fmnt->mntopts |= get_unprivileged_proc_debug(td) ? FUSEFS_UNPRIVPROCDBG : 0; - #endif -@@ -2380,7 +2380,7 @@ - return (0); - } - --#if FUSE_HAS_CREATE -+#ifdef FUSE_HAS_CREATE - /* - * Vnode comparison function with which the given vnode always - * gets inserted, but got marked invalid upon a clash. Caller -@@ -2654,7 +2654,7 @@ - - fuse_filehandle_gc(vp, td, NULL); - --#if ! DONT_STORE_FS_MAP -+#ifndef DONT_STORE_FS_MAP - /* - * Dropping vnodes when they are not in use would mean that - * the respective inode must be freed on the daemon's side -@@ -2751,7 +2751,7 @@ - int denied; - - if ((denied = cr_candebug( --#if REALTIME_TRACK_UNPRIVPROCDBG -+#ifdef REALTIME_TRACK_UNPRIVPROCDBG - get_unprivileged_proc_debug(td), - #else - fmnt->mntopts & FUSEFS_UNPRIVPROCDBG, -@@ -2948,7 +2948,7 @@ - - } else { - struct sx *devlock = fdi.slock; --#if FUSE_HAS_ACCESS -+#ifdef FUSE_HAS_ACCESS - struct fuse_access_in *fai; - - if (! (facp->facc_flags & FACCESS_DO_ACCESS)) -@@ -3056,7 +3056,7 @@ - - bzero(&facp, sizeof(facp)); - if ( --#if NO_EARLY_PERM_CHECK_HACK -+#ifdef NO_EARLY_PERM_CHECK_HACK - 1 - #else - dvp->v_vflag & VV_ROOT -@@ -3281,8 +3281,12 @@ - DEBUG("we peacefully found that file\n"); - - if (flags & ISDOTDOT) { -- vn_lock(pdp, LK_EXCLUSIVE | LK_RETRY, td); -+ VOP_UNLOCK(dvp, 0, td); -+ err = vn_lock(pdp, cnp->cn_lkflags, td); - VREF(pdp); -+ vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY, td); -+ if (err) -+ goto out; - *vpp = pdp; - } else if (nid == VTOI(dvp)) { - VREF(dvp); /* We want ourself, ie "." */ -@@ -3347,7 +3351,7 @@ - if (islastcn && flags & ISOPEN) - ((struct fuse_vnode_data *)(*vpp)->v_data)->flags |= FVP_ACCESS_NOOP; - --#if ! NO_EARLY_PERM_CHECK_HACK -+#ifndef NO_EARLY_PERM_CHECK_HACK - if (! islastcn) { - /* We have the attributes of the next item - * *now*, and it's a fact, and we do not have -@@ -3486,7 +3490,7 @@ - return (0); - } - --#if FUSE_HAS_CREATE -+#ifdef FUSE_HAS_CREATE - static __inline int - create_filehandle(struct vnode *vp, struct thread *td, struct ucred *cred, - int mode, struct fuse_dispatcher *fdip) -@@ -3643,7 +3647,7 @@ - * the vnode... if the vnode is a germ, it will be tried to be initialized - * via a dedicated method, but from that on we go on as usual.) - */ --#if FUSE_HAS_CREATE -+#ifdef FUSE_HAS_CREATE - if (vp->v_op == &fuse_germ_vnops) { - KASSERT(gefhp, ("create_filehandle called without get_filehandle_param")); - gone_create = 1; -@@ -3709,7 +3713,7 @@ - if ((err = fdisp_wait_answ(&fdi))) - goto out; - --#if FUSE_HAS_CREATE -+#ifdef FUSE_HAS_CREATE - setup_filehandle: - #endif - foo = fdi.answ; -@@ -4184,7 +4188,7 @@ - #define BSD_FUSE_PAGENO_BOUND MIN(FUSE_MAX_PAGES_PER_REQ, MAXBSIZE / PAGE_SIZE) - - bcount = MIN(MAXBSIZE, biosize * BSD_FUSE_PAGENO_BOUND); --#if BIOREAD_CONSIDER_FILE_SIZE -+#ifdef BIOREAD_CONSIDER_FILE_SIZE - if (vp->v_type != VDIR) { - /* - * for directories we can't predict the size, in fact -@@ -4493,7 +4497,7 @@ - break; - } - --#if ZERO_PAD_INCOMPLETE_BUFS -+#ifdef ZERO_PAD_INCOMPLETE_BUFS - if (isbzero(buf), FUSE_NAME_OFFSET) { - err = -1; - break; -@@ -4658,7 +4662,7 @@ - struct vnode *dvp = ap->a_dvp; - struct vnode **vpp = ap->a_vpp; - struct vattr *vap = ap->a_vap; --#if FUSE_HAS_CREATE -+#ifdef FUSE_HAS_CREATE - struct fuse_dispatcher fdi; - struct fuse_vnode_data *fvdat; - int err; -@@ -4949,7 +4953,7 @@ - if (err) - goto out; - --#if ! DONT_DO_CHECKPATH -+#ifndef DONT_DO_CHECKPATH - if (doingdirectory && fdvp != tdvp) { - /* - * Check for pathname conflict. -@@ -5396,7 +5400,6 @@ - struct vnode *vp = fioda->vp; - struct uio *uio = fioda->uio; - struct ucred *cred = fioda->cred; -- struct fuse_filehandle *fufh = fioda->fufh; - - int biosize; - -@@ -5506,7 +5509,7 @@ - if ((bp->b_flags & B_CACHE) == 0) { - bp->b_iocmd = BIO_READ; - vfs_busy_pages(bp, 0); -- fuse_strategy_i(vp, bp, fufh, 0); -+ fuse_strategy_i(vp, bp, NULL, 0); - if ((err = bp->b_error)) { - brelse(bp); - break; -@@ -5741,7 +5744,7 @@ - chunksize, (long long unsigned)fri->offset, respsize); - - if (respsize < chunksize) { --#if ZERO_PAD_INCOMPLETE_BUFS -+#ifdef ZERO_PAD_INCOMPLETE_BUFS - /* - * "if we don't get enough data, just fill the - * rest with zeros." -@@ -5888,7 +5891,7 @@ - "vp=%p, rc=%d", bp, vp, rc)); - } - --#if FUSE_HAS_CREATE -+#ifdef FUSE_HAS_CREATE - static int - fuse_germ_access(struct vop_access_args *ap) - { -@@ -5908,7 +5911,7 @@ - - /* Modeled after tunclone() of net/if_tun.c - */ --#if USE_OLD_CLONEHANDLER_API -+#ifdef USE_OLD_CLONEHANDLER_API - static void - fusedev_clone(void *arg, char *name, int namelen, struct cdev **dev) - #else -@@ -6019,7 +6022,7 @@ - fuse_fileops.fo_close = fuse_close_f; - fuse_fileops.fo_flags = DFLAG_PASSABLE | DFLAG_SEEKABLE; - --#if FUSE_HAS_CREATE -+#ifdef FUSE_HAS_CREATE - memcpy(&fuse_germ_vnops, &dead_vnodeops, sizeof(struct vop_vector)); - fuse_germ_vnops.vop_access = fuse_germ_access; - fuse_germ_vnops.vop_open = fuse_open; ---- fuse_module/fuse.h.orig Fri Feb 10 17:31:53 2006 -+++ fuse_module/fuse.h Sun Jul 16 14:43:20 2006 -@@ -8,7 +8,7 @@ - - #ifndef USE_OLD_CLONEHANDLER_API - #if __FreeBSD_version < 600034 || ( __FreeBSD_version >= 700000 && __FreeBSD_version < 700002 ) --#define USE_OLD_CLONEHANDLER_API 1 -+#define USE_OLD_CLONEHANDLER_API - #endif - #endif - -@@ -19,10 +19,10 @@ - */ - #if FUSE_KERNELABI_GEQ(7, 3) - #ifndef FUSE_HAS_ACCESS --#define FUSE_HAS_ACCESS 1 -+#define FUSE_HAS_ACCESS - #endif - #ifndef FUSE_HAS_CREATE --#define FUSE_HAS_CREATE 1 -+#define FUSE_HAS_CREATE - #endif - #endif - -@@ -75,7 +75,7 @@ - size_t len; /* To keep track of size of the data pushed into base, =< len, of course */ - }; - --#if ! FUSE_AUX -+#ifndef FUSE_AUX - #ifndef FUSE_MAX_STORED_FREE_TICKETS - #define FUSE_MAX_STORED_FREE_TICKETS 0 - #endif -@@ -251,7 +251,7 @@ - int flags; - LIST_HEAD(, fuse_filehandle) fh_head; - int fh_counter; --#if FUSE_HAS_CREATE -+#ifdef FUSE_HAS_CREATE - struct componentname *germcnp; - #endif - }; -@@ -260,6 +260,9 @@ - - /* Debug related stuff */ - -+#ifndef DEBUGTOLOG -+#define DEBUGTOLOG 0 -+#endif - #if DEBUGTOLOG - #define dprintf(args ...) log(LOG_DEBUG, args) - #else -@@ -267,6 +270,9 @@ - #endif - - #define DEBLABEL "[fuse-debug] " -+#ifndef _DEBUG -+#define _DEBUG 0 -+#endif - #if _DEBUG - #ifndef _DEBUG2G - #define _DEBUG2G 1 -@@ -280,6 +286,9 @@ - #define DEBUG(args ...) - #endif - -+#ifndef _DEBUG2G -+#define _DEBUG2G 0 -+#endif - #if _DEBUG2G - #ifndef _DEBUG3G - #define _DEBUG3G 1 -@@ -290,6 +299,9 @@ - #define DEBUG2G(args ...) - #endif - -+#ifndef _DEBUG3G -+#define _DEBUG3G 0 -+#endif - #if _DEBUG3G - #define DEBUG3G(args, ...) \ - printf(DEBLABEL "%s:%d: " args, __func__, __LINE__, ## __VA_ARGS__) -@@ -297,13 +309,19 @@ - #define DEBUG3G(args ...) - #endif - -+#ifndef FMASTER -+#define FMASTER 0 -+#endif - #if FMASTER - #ifndef _DEBUG_MSGING - #define _DEBUG_MSGING 1 - #endif - #endif - --#if _DEBUG_MSGING -+#ifndef _DEBUG_MSG -+#define _DEBUG_MSG 0 -+#endif -+#ifdef _DEBUG_MSGING - #define fuprintf(args...) \ - uprintf("[kern] " args) - #else -@@ -319,7 +337,7 @@ - void fprettyprint(struct fuse_iov *fiov, size_t dlen); - #endif - --#if IGNORE_INLINE -+#ifdef IGNORE_INLINE - #define __inline - #endif - ---- fuse_module/fuse_subr.c.orig Fri Feb 10 17:31:53 2006 -+++ fuse_module/fuse_subr.c Wed Sep 27 11:57:01 2006 -@@ -15,9 +15,11 @@ - { - int err; - int unprivileged_proc_debug; -+ size_t ilen = sizeof(unprivileged_proc_debug); - - err = kernel_sysctlbyname(td, "security.bsd.unprivileged_proc_debug", -- NULL, 0, &unprivileged_proc_debug, sizeof(unprivileged_proc_debug), NULL, 0); -+ &unprivileged_proc_debug, &ilen, -+ NULL, 0, NULL, 0); - - if (err) - unprivileged_proc_debug = 0; |