From owner-svn-src-projects@freebsd.org Sat May 25 21:40:29 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 61C5E15B6F64 for ; Sat, 25 May 2019 21:40:29 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F30D28A5B6; Sat, 25 May 2019 21:40:28 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DE79AA19E; Sat, 25 May 2019 21:40:28 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4PLeSvC009067; Sat, 25 May 2019 21:40:28 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4PLeSFw009063; Sat, 25 May 2019 21:40:28 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201905252140.x4PLeSFw009063@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Sat, 25 May 2019 21:40:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r348281 - in projects/fuse2: share/mk sys/fs/fuse tests/sys/fs X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in projects/fuse2: share/mk sys/fs/fuse tests/sys/fs X-SVN-Commit-Revision: 348281 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: F30D28A5B6 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.962,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 May 2019 21:40:29 -0000 Author: asomers Date: Sat May 25 21:40:27 2019 New Revision: 348281 URL: https://svnweb.freebsd.org/changeset/base/348281 Log: fusefs: misc build fixes * Only build the tests on platforms with C++14 support * Fix an undefined symbol error on lint builds * Remove an unused function: fiov_clear Sponsored by: The FreeBSD Foundation Modified: projects/fuse2/share/mk/bsd.compiler.mk projects/fuse2/sys/fs/fuse/fuse_internal.c projects/fuse2/sys/fs/fuse/fuse_ipc.c projects/fuse2/tests/sys/fs/Makefile Modified: projects/fuse2/share/mk/bsd.compiler.mk ============================================================================== --- projects/fuse2/share/mk/bsd.compiler.mk Sat May 25 20:53:23 2019 (r348280) +++ projects/fuse2/share/mk/bsd.compiler.mk Sat May 25 21:40:27 2019 (r348281) @@ -19,6 +19,7 @@ # COMPILER_FEATURES will contain one or more of the following, based on # compiler support for that feature: # +# - c++14: supports full (or nearly full) C++14 programming environment. # - c++11: supports full (or nearly full) C++11 programming environment. # - retpoline: supports the retpoline speculative execution vulnerability # mitigation. @@ -200,6 +201,10 @@ ${X_}COMPILER_FREEBSD_VERSION= unknown .endif ${X_}COMPILER_FEATURES= +.if ${${X_}COMPILER_TYPE} == "clang" || \ + (${${X_}COMPILER_TYPE} == "gcc" && ${${X_}COMPILER_VERSION} >= 50000) +${X_}COMPILER_FEATURES+= c++14 +.endif .if ${${X_}COMPILER_TYPE} == "clang" || \ (${${X_}COMPILER_TYPE} == "gcc" && ${${X_}COMPILER_VERSION} >= 40800) ${X_}COMPILER_FEATURES+= c++11 Modified: projects/fuse2/sys/fs/fuse/fuse_internal.c ============================================================================== --- projects/fuse2/sys/fs/fuse/fuse_internal.c Sat May 25 20:53:23 2019 (r348280) +++ projects/fuse2/sys/fs/fuse/fuse_internal.c Sat May 25 21:40:27 2019 (r348281) @@ -208,7 +208,7 @@ fuse_internal_cache_attrs(struct vnode *vp, struct ucr if (!cred) cred = curthread->td_ucred; - ASSERT_VOP_ELOCKED(*vpp, "fuse_internal_cache_attrs"); + ASSERT_VOP_ELOCKED(vp, "fuse_internal_cache_attrs"); fuse_validity_2_bintime(attr_valid, attr_valid_nsec, &fvdat->attr_cache_timeout); Modified: projects/fuse2/sys/fs/fuse/fuse_ipc.c ============================================================================== --- projects/fuse2/sys/fs/fuse/fuse_ipc.c Sat May 25 20:53:23 2019 (r348280) +++ projects/fuse2/sys/fs/fuse/fuse_ipc.c Sat May 25 21:40:27 2019 (r348281) @@ -94,7 +94,6 @@ SDT_PROBE_DEFINE2(fusefs, , ipc, trace, "int", "char*" static void fdisp_make_pid(struct fuse_dispatcher *fdip, enum fuse_opcode op, struct fuse_data *data, uint64_t nid, pid_t pid, struct ucred *cred); -static void fiov_clear(struct fuse_iov *fiov); static void fuse_interrupt_send(struct fuse_ticket *otick, int err); static struct fuse_ticket *fticket_alloc(struct fuse_data *data); static void fticket_refresh(struct fuse_ticket *ftick); @@ -296,13 +295,6 @@ fiov_adjust(struct fuse_iov *fiov, size_t size) bzero((char*)fiov->base + fiov->len, size - fiov->len); } fiov->len = size; -} - -/* Clear the fiov's data buffer */ -static void -fiov_clear(struct fuse_iov *fiov) -{ - bzero(fiov->base, fiov->len); } /* Resize the fiov if needed, and clear it's buffer */ Modified: projects/fuse2/tests/sys/fs/Makefile ============================================================================== --- projects/fuse2/tests/sys/fs/Makefile Sat May 25 20:53:23 2019 (r348280) +++ projects/fuse2/tests/sys/fs/Makefile Sat May 25 21:40:27 2019 (r348281) @@ -1,5 +1,7 @@ # $FreeBSD$ +.include + PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/fs @@ -7,7 +9,9 @@ TESTSDIR= ${TESTSBASE}/sys/fs TESTSRC= ${SRCTOP}/contrib/netbsd-tests/fs #TESTS_SUBDIRS+= nullfs # XXX: needs rump +.if ${COMPILER_FEATURES:Mc++14} TESTS_SUBDIRS+= fusefs +.endif TESTS_SUBDIRS+= tmpfs ${PACKAGE}FILES+= h_funcs.subr