From owner-svn-src-projects@freebsd.org Sat Jul 13 14:42:10 2019
Return-Path: <owner-svn-src-projects@freebsd.org>
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 4E1D615EA85A
for <svn-src-projects@mailman.ysv.freebsd.org>;
Sat, 13 Jul 2019 14:42:10 +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 E8CEA88AC2;
Sat, 13 Jul 2019 14:42:09 +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 D784B27414;
Sat, 13 Jul 2019 14:42:09 +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 x6DEg9FQ020035;
Sat, 13 Jul 2019 14:42:09 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6DEg9vR020034;
Sat, 13 Jul 2019 14:42:09 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201907131442.x6DEg9vR020034@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Sat, 13 Jul 2019 14:42:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r349970 - in projects/fuse2: sys/fs/fuse
tests/sys/fs/fusefs
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: in projects/fuse2: sys/fs/fuse tests/sys/fs/fusefs
X-SVN-Commit-Revision: 349970
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: E8CEA88AC2
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-2.97 / 15.00];
local_wl_from(0.00)[FreeBSD.org];
NEURAL_HAM_MEDIUM(-1.00)[-1.000,0];
NEURAL_HAM_SHORT(-0.97)[-0.973,0];
ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US];
NEURAL_HAM_LONG(-1.00)[-1.000,0]
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" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Jul 2019 14:42:10 -0000
Author: asomers
Date: Sat Jul 13 14:42:09 2019
New Revision: 349970
URL: https://svnweb.freebsd.org/changeset/base/349970
Log:
projects/fuse2: build fixes
* Fix the kernel build with gcc by removing a redundant extern declaration
* In the tests, fix a printf format specifier that assumed LP64
Sponsored by: The FreeBSD Foundation
Modified:
projects/fuse2/sys/fs/fuse/fuse_main.c
projects/fuse2/tests/sys/fs/fusefs/mockfs.cc
Modified: projects/fuse2/sys/fs/fuse/fuse_main.c
==============================================================================
--- projects/fuse2/sys/fs/fuse/fuse_main.c Sat Jul 13 12:48:28 2019 (r349969)
+++ projects/fuse2/sys/fs/fuse/fuse_main.c Sat Jul 13 14:42:09 2019 (r349970)
@@ -95,7 +95,6 @@ struct mtx fuse_mtx;
extern struct vfsops fuse_vfsops;
extern struct cdevsw fuse_cdevsw;
extern struct vop_vector fuse_fifonops;
-extern struct vop_vector fuse_vnops;
extern uma_zone_t fuse_pbuf_zone;
static struct vfsconf fuse_vfsconf = {
Modified: projects/fuse2/tests/sys/fs/fusefs/mockfs.cc
==============================================================================
--- projects/fuse2/tests/sys/fs/fusefs/mockfs.cc Sat Jul 13 12:48:28 2019 (r349969)
+++ projects/fuse2/tests/sys/fs/fusefs/mockfs.cc Sat Jul 13 14:42:09 2019 (r349970)
@@ -169,8 +169,8 @@ void MockFS::debug_request(const mockfs_buf_in &in)
printf(" mask=%#x", in.body.access.mask);
break;
case FUSE_BMAP:
- printf(" block=%#lx blocksize=%#x", in.body.bmap.block,
- in.body.bmap.blocksize);
+ printf(" block=%" PRIx64 " blocksize=%#x",
+ in.body.bmap.block, in.body.bmap.blocksize);
break;
case FUSE_CREATE:
if (m_kernel_minor_version >= 12)
From owner-svn-src-projects@freebsd.org Sat Jul 13 21:41:14 2019
Return-Path: <owner-svn-src-projects@freebsd.org>
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 16AE515CD956
for <svn-src-projects@mailman.ysv.freebsd.org>;
Sat, 13 Jul 2019 21:41:14 +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 B08E770779;
Sat, 13 Jul 2019 21:41:13 +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 8B04D2BA21;
Sat, 13 Jul 2019 21:41:13 +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 x6DLfDLQ061829;
Sat, 13 Jul 2019 21:41:13 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id x6DLfDmW061827;
Sat, 13 Jul 2019 21:41:13 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201907132141.x6DLfDmW061827@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Sat, 13 Jul 2019 21:41:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r349977 - projects/fuse2/sys/fs/fuse
X-SVN-Group: projects
X-SVN-Commit-Author: asomers
X-SVN-Commit-Paths: projects/fuse2/sys/fs/fuse
X-SVN-Commit-Revision: 349977
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: B08E770779
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-2.97 / 15.00];
local_wl_from(0.00)[FreeBSD.org];
NEURAL_HAM_MEDIUM(-1.00)[-1.000,0];
NEURAL_HAM_SHORT(-0.97)[-0.970,0];
ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US];
NEURAL_HAM_LONG(-1.00)[-1.000,0]
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" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Jul 2019 21:41:14 -0000
Author: asomers
Date: Sat Jul 13 21:41:12 2019
New Revision: 349977
URL: https://svnweb.freebsd.org/changeset/base/349977
Log:
fusefs: fix the build with some NODEBUG kernels
systm.h needs to be included before counter.h
Sponsored by: The FreeBSD Foundation
Modified:
projects/fuse2/sys/fs/fuse/fuse_file.c
projects/fuse2/sys/fs/fuse/fuse_internal.c
projects/fuse2/sys/fs/fuse/fuse_node.c
Modified: projects/fuse2/sys/fs/fuse/fuse_file.c
==============================================================================
--- projects/fuse2/sys/fs/fuse/fuse_file.c Sat Jul 13 16:48:27 2019 (r349976)
+++ projects/fuse2/sys/fs/fuse/fuse_file.c Sat Jul 13 21:41:12 2019 (r349977)
@@ -64,9 +64,9 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
+#include <sys/systm.h>
#include <sys/counter.h>
#include <sys/module.h>
-#include <sys/systm.h>
#include <sys/errno.h>
#include <sys/kernel.h>
#include <sys/conf.h>
Modified: projects/fuse2/sys/fs/fuse/fuse_internal.c
==============================================================================
--- projects/fuse2/sys/fs/fuse/fuse_internal.c Sat Jul 13 16:48:27 2019 (r349976)
+++ projects/fuse2/sys/fs/fuse/fuse_internal.c Sat Jul 13 21:41:12 2019 (r349977)
@@ -64,9 +64,9 @@
__FBSDID("$FreeBSD$");
#include <sys/param.h>
+#include <sys/systm.h>
#include <sys/counter.h>
#include <sys/module.h>
-#include <sys/systm.h>
#include <sys/errno.h>
#include <sys/kernel.h>
#include <sys/conf.h>
Modified: projects/fuse2/sys/fs/fuse/fuse_node.c
==============================================================================
--- projects/fuse2/sys/fs/fuse/fuse_node.c Sat Jul 13 16:48:27 2019 (r349976)
+++ projects/fuse2/sys/fs/fuse/fuse_node.c Sat Jul 13 21:41:12 2019 (r349977)
@@ -64,9 +64,9 @@
__FBSDID("$FreeBSD$");
#include <sys/types.h>
+#include <sys/systm.h>
#include <sys/counter.h>
#include <sys/module.h>
-#include <sys/systm.h>
#include <sys/errno.h>
#include <sys/param.h>
#include <sys/kernel.h>