From nobody Sat Feb 05 01:44:37 2022 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 468A319B8382; Sat, 5 Feb 2022 01:44:38 +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 4JrFZZ1XBLz4Ymn; Sat, 5 Feb 2022 01:44:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644025478; 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=n498nr7Rl61w7XtR/NkAqLDZUq476zcU5IrjjJXGBxc=; b=BNSlVtE0Qpujt6piolx7Tq046TOf6cUZAQfSeSvBewkgfUml+nYGOjJnS4jt5FSgCRsKYM cF08lSy6081uEBratCZwGxl3REaBWhfBEgM0i5ROLfaz/FVLyn7RjVW7QL1qZsRTSQfaqt 9kC1cr4mc1+dwZqjwiSv8wBnGwdBoS0Z+qhsGJPHlsJZ8fDbGaX2mGssNjAPuREF/fRKkS sszxiDjNC8Uuw9Mfe2GVPQ0na71MzXD0lVizMebLY4bU6I0P/rLdK1xDGk1AQaGsN/CdBb Z4nWwHnwSilRY9zUK3DXHQU9FHXzjFSMvzW6ztTJF2anVSnTCjPGy9rfwXmCdw== 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 10CD016AEC; Sat, 5 Feb 2022 01:44:38 +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 2151ib0I061163; Sat, 5 Feb 2022 01:44:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2151ibIC061162; Sat, 5 Feb 2022 01:44:37 GMT (envelope-from git) Date: Sat, 5 Feb 2022 01:44:37 GMT Message-Id: <202202050144.2151ibIC061162@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: 18ed2ce77a25 - main - fusefs: fix the build without INVARIANTS after 00134a07898 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 18ed2ce77a254f365a4687d6afe8eeba2aad2e13 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644025478; 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=n498nr7Rl61w7XtR/NkAqLDZUq476zcU5IrjjJXGBxc=; b=PGQdDnfo2JF0MYRqb1XKRP1L4fUX2zWDAWXCW9gYU9jtij5hR646W3uGbDtnv0rPofEV9J EIVdyojhsIzloBsLZbtKrUkvDccvet4tEy5bKWjW9PwA24CsSBqS2fcrLY3WYnIns6rceR 0AFIyWKYZ4a0kv8v3DFDxCpsG9fK1VdfutoexJqOlj33umJJ6VGUmcsW+HgUitYYsxatgj H7m6fk3FZh83Mq2LqS8XmFWA0KB7Dg3/FpvuWyeMw4pbmRbzkav5nY1Qe95sFTsVSXTw0c MVrV5LfXpvFZ1nUpDL3oDJey+llxoPLPuy9OtU4ivBoi2RndMzqWUwvEEbmXfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644025478; a=rsa-sha256; cv=none; b=Zk7VAbTPrhqi6fkFTzja39k64rnBUHO6FsEl2cXIV8oTunBOFvsRlXom9IngWT9KMMEr0/ thH54Ej2Y1EY/zXpoah4n3wdIPIwDlRSV1kSgvu7BPGj+Jl+FRX4YK5Y/vcZCfnMYl5o03 4vnM5q1LXZ9RhKlwr+Wz8wqG4UP2Y/7FMbyoUTZLqNObms4mE48SMM0rhhGnoCsWOGzbet 07HxUXeS7hMfns6BpoYKasCAf3b3pCyvyJLS486Z/rznP8LDmnfQyYECEbxCnR+HIhWk2R i4j9Vg4SAKmUTObCp5yCUXvn+3q+DzqJdzWa1nA5hbUfGLHGb7Fw2Ez1U3hUXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=18ed2ce77a254f365a4687d6afe8eeba2aad2e13 commit 18ed2ce77a254f365a4687d6afe8eeba2aad2e13 Author: Alan Somers AuthorDate: 2022-02-05 01:43:23 +0000 Commit: Alan Somers CommitDate: 2022-02-05 01:44:27 +0000 fusefs: fix the build without INVARIANTS after 00134a07898 MFC after: 2 weeks MFC with: 00134a07898fa807b8a1fcb2596f0e3644143f69 Reported by: se --- sys/fs/fuse/fuse_vnops.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index 10d64390123d..3de44bf6a023 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -1868,9 +1868,8 @@ fuse_vnop_readdir(struct vop_readdir_args *ap) tresid = uio->uio_resid; err = fuse_filehandle_get_dir(vp, &fufh, cred, pid); if (err == EBADF && mp->mnt_flag & MNT_EXPORTED) { - struct fuse_data *data = fuse_get_mpdata(mp); - - KASSERT(data->dataflags & FSESS_NO_OPENDIR_SUPPORT, + KASSERT(fuse_get_mpdata(mp)->dataflags + & FSESS_NO_OPENDIR_SUPPORT, ("FUSE file systems that don't set " "FUSE_NO_OPENDIR_SUPPORT should not be exported")); /*