From owner-dev-commits-src-all@freebsd.org Wed Sep 15 19:00:16 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A3F8E66C6A9; Wed, 15 Sep 2021 19:00:16 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H8qKX47Zfz4qGS; Wed, 15 Sep 2021 19:00:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6E56C135D8; Wed, 15 Sep 2021 19:00:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18FJ0G99019651; Wed, 15 Sep 2021 19:00:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18FJ0Ghl019644; Wed, 15 Sep 2021 19:00:16 GMT (envelope-from git) Date: Wed, 15 Sep 2021 19:00:16 GMT Message-Id: <202109151900.18FJ0Ghl019644@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: ff33e5c83fa8 - main - stress2: replace fuse.ko with fusefs.ko MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ff33e5c83fa8448aa9a594783f20f501942087f0 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Sep 2021 19:00:16 -0000 The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=ff33e5c83fa8448aa9a594783f20f501942087f0 commit ff33e5c83fa8448aa9a594783f20f501942087f0 Author: Alan Somers AuthorDate: 2021-09-14 22:00:53 +0000 Commit: Alan Somers CommitDate: 2021-09-15 18:59:21 +0000 stress2: replace fuse.ko with fusefs.ko It got renamed in FreeBSD 13 Reviewed by: pho MFC after: 2 weeks Sponsored by: Axcient Differential Revision: https://reviews.freebsd.org/D31963 --- tools/test/stress2/misc/fuse.sh | 2 +- tools/test/stress2/misc/fuse2.sh | 4 ++-- tools/test/stress2/misc/fuse3.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/test/stress2/misc/fuse.sh b/tools/test/stress2/misc/fuse.sh index 682fdb122845..08c63996a81b 100755 --- a/tools/test/stress2/misc/fuse.sh +++ b/tools/test/stress2/misc/fuse.sh @@ -33,7 +33,7 @@ . ../default.cfg [ -z "`type mkntfs 2>/dev/null`" ] && exit 0 -[ -c /dev/fuse ] || kldload fuse.ko +[ -c /dev/fuse ] || kldload fusefs.ko MOUNT=/usr/local/bin/ntfs-3g diff --git a/tools/test/stress2/misc/fuse2.sh b/tools/test/stress2/misc/fuse2.sh index 3bd54fa080f5..d155386972c1 100755 --- a/tools/test/stress2/misc/fuse2.sh +++ b/tools/test/stress2/misc/fuse2.sh @@ -32,11 +32,11 @@ [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 [ -z "`type mkntfs 2>/dev/null`" ] && exit 0 -[ -c /dev/fuse ] || kldload fuse.ko +[ -c /dev/fuse ] || kldload fusefs.ko . ../default.cfg -[ -c /dev/fuse ] || kldload fuse.ko +[ -c /dev/fuse ] || kldload fusefs.ko MOUNT=/usr/local/bin/ntfs-3g mounts=15 # Number of parallel scripts mdstart=$mdstart # Use md unit numbers from this point diff --git a/tools/test/stress2/misc/fuse3.sh b/tools/test/stress2/misc/fuse3.sh index d11e9f4140f7..9da6f92b175f 100755 --- a/tools/test/stress2/misc/fuse3.sh +++ b/tools/test/stress2/misc/fuse3.sh @@ -36,7 +36,7 @@ sleep 10 while pgrep -q swap; do - kldload fuse.ko - kldunload fuse.ko + kldload fusefs.ko + kldunload fusefs.ko done wait