From nobody Tue Mar 07 17:21:40 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PWMgT3ydFz3wPTl; Tue, 7 Mar 2023 17:21:41 +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 4PWMgT0rThz4Pr1; Tue, 7 Mar 2023 17:21:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678209701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iyS9goIbiq43gR7ApJmDuV6OzsOAF3nE0bxRt1DAVNM=; b=PmN12C9Zqwd6Y5PsPG+2zTSOdf7I1cUUUHx8eU47y1RR4TdVnvo1dn1QAgqewHkVRC2Ep6 cAV2ndhm7AcrNtzqMjfBesh7pr5KXMCRNXxqa0MgxlSlz1S10epcFMmlNVuwy+XVdUE7H2 fwvYzFf2HkGxU6sNLZznj5XC7TuAv85coLS0sCsHkqnG4E6vWRwtgLb1lXOq0XqiUNENDq /yQA+TpfeOJPUPXjdfNmCxVv815xi3eJSYgJv/3g3xq2erD7b5k7iUBTUplTe7AStJDiAs oSWa/PnO+Yw//Olsmv+7EdogfgITQH6nIi9ju9SkxNLhhddHKLqb2M558n6j/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678209701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iyS9goIbiq43gR7ApJmDuV6OzsOAF3nE0bxRt1DAVNM=; b=q0MJ2YqM+Jz9qIRCgJmPOLcRP9CiA5ryKk3zPN5gXs5rWdaFQt1jK2fhTJNZeNdWyiw6sp KLsDbroy5nikEcIh+zpIpEuoseqWJqibwBDYvTHP7Sgc5X11spn7KNAdVh+VtHGKbLulM4 suIkWIQICuNGiV2xM91uASV6UXpvZBV7qguZ/0K3ofU+8TNSRbR+ERflKNvOQNtnY9t/6Q NTGdBVaSctyBR95YkuHY/eBarq6DBD0V106shCqQccubn12Yh+AbuwjEEY/IYzlqubeb2g t6vjNJskWNWCsxsryQz0+tCuHIvdldjapXFTEU/3KI92ugeqRYPMe4+vhFGimQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678209701; a=rsa-sha256; cv=none; b=YIS6PMhnHuR6i+3TiiRQjUcF0gV3abGwpQD1auCTJxuh9aGsbUWwv8bLf1mvDG6gydOSvY G5UgOYWgmqbN0e6bqGBTxIaEzixbqGOFbmRw/GLXYqtC3wQc4aHhhJ+UHwlf4Qq6ZxnEu3 VbttvvYjuoGj2QnjKzx0M7sD0KYpuF5FFjWTRQqmvKXdSZTKjHJwYgBAmWXLLQ0wHGa0A9 quIFTGbw+OYPfxWf4BUzDWliTdUiDnWLIPSOlfcjB7uAuLxV6o1vqNKFOv7t+rDvX/mHmZ LcRIbm2Bm+NWEgiURFtOfUxNDTsbIDN6cauoFxySwjlmE1+5lIJGELP5foIx0w== 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 4PWMgS70g3zrnp; Tue, 7 Mar 2023 17:21:40 +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 327HLe2Z068533; Tue, 7 Mar 2023 17:21:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 327HLe8B068532; Tue, 7 Mar 2023 17:21:40 GMT (envelope-from git) Date: Tue, 7 Mar 2023 17:21:40 GMT Message-Id: <202303071721.327HLe8B068532@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: b1218349edec - main - tarfs: Set mountedfrom correctly. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1218349edecda9723430be45c68f6e1d29e32fe Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b1218349edecda9723430be45c68f6e1d29e32fe commit b1218349edecda9723430be45c68f6e1d29e32fe Author: Dag-Erling Smørgrav AuthorDate: 2023-03-07 16:04:18 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-03-07 17:20:49 +0000 tarfs: Set mountedfrom correctly. Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc. Reviewed by: sjg, kib Differential Revision: https://reviews.freebsd.org/D38930 --- sys/fs/tarfs/tarfs_vfsops.c | 2 +- tests/sys/fs/tarfs/tarfs_test.sh | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/fs/tarfs/tarfs_vfsops.c b/sys/fs/tarfs/tarfs_vfsops.c index 059608ea60a5..03dc598f4b69 100644 --- a/sys/fs/tarfs/tarfs_vfsops.c +++ b/sys/fs/tarfs/tarfs_vfsops.c @@ -991,7 +991,7 @@ tarfs_mount(struct mount *mp) MNT_IUNLOCK(mp); vfs_getnewfsid(mp); - vfs_mountedfrom(mp, "tarfs"); + vfs_mountedfrom(mp, from); TARFS_DPF(FS, "%s: success\n", __func__); return (0); diff --git a/tests/sys/fs/tarfs/tarfs_test.sh b/tests/sys/fs/tarfs/tarfs_test.sh index 388a78efa476..32576cbf57b6 100644 --- a/tests/sys/fs/tarfs/tarfs_test.sh +++ b/tests/sys/fs/tarfs/tarfs_test.sh @@ -38,10 +38,12 @@ tarfs_basic_head() { atf_set "require.user" "root" } tarfs_basic_body() { + local tarball="${PWD}/tarfs_test.tar.zst" kldload -n tarfs || atf_skip "This test requires tarfs and could not load it" mkdir "${mnt}" - "${mktar}" tarfs_test.tar.zst - atf_check mount -rt tarfs tarfs_test.tar.zst "${mnt}" + "${mktar}" "${tarball}" + atf_check mount -rt tarfs "${tarball}" "${mnt}" + atf_check -o match:"^${tarball} on ${mnt} \(tarfs," mount atf_check_equal "$(stat -f%d,%i "${mnt}"/sparse_file)" "$(stat -f%d,%i "${mnt}"/hard_link)" atf_check_equal "$(stat -f%d,%i "${mnt}"/sparse_file)" "$(stat -L -f%d,%i "${mnt}"/short_link)" atf_check_equal "$(stat -f%d,%i "${mnt}"/sparse_file)" "$(stat -L -f%d,%i "${mnt}"/long_link)"