From nobody Thu Oct 27 12:43:05 2022 X-Original-To: dev-commits-src-all@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 4MylhT5rd0z4fwM3; Thu, 27 Oct 2022 12:43:05 +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 4MylhT59Pwz3Bxn; Thu, 27 Oct 2022 12:43:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666874585; 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=X4VtPzHsJvUgicrZIbG68/XVUqpsRu0XIjS1CjRXz8s=; b=D/TJg0HI2E6dC9Yxs/Li+huX4lOyBn1xNbnKoQgjfjlA5/Xr4iLAmhJ90u4zjJOPy6H+b5 h/G1YGF/tIX1LQHOgTkEms7gjAtTqGlbzJnVce82zSlf1w4gzf7xDMfNAv4jHOY6al5X6M ykm07TWNHdl0i0keLSBjlf6JszK/DkCl/FqVTz13mn6GECA3/0dXqstUMQKEqiQh0fmwTL EyVM2RmlNC6zQSQ/Fub/PZwBbmzOuRUeE2ajGlFnteullZ1XlKV9r8jjjSe5RXh6q9UgS1 zvFxD/TuAqIF7+31hy3d53YC2ieP/q/cuXAWowallwaT2PS9CFbfAWTcIkunsg== 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 4MylhT4CqqzxlY; Thu, 27 Oct 2022 12:43:05 +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 29RCh5YO077617; Thu, 27 Oct 2022 12:43:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29RCh5Tb077616; Thu, 27 Oct 2022 12:43:05 GMT (envelope-from git) Date: Thu, 27 Oct 2022 12:43:05 GMT Message-Id: <202210271243.29RCh5Tb077616@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: ce3a386d627d - stable/13 - zfs: Fix the build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ce3a386d627d808997959971132c149ea6ce9d43 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666874585; 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=X4VtPzHsJvUgicrZIbG68/XVUqpsRu0XIjS1CjRXz8s=; b=sJgd4L1VuiNZgVPJVCJdolFvIDbVRvK9arLShW+Pcn/hfyo3bjDwcRuHro6YM79Sp3Zpjp VYF23ZN+JFo6rXObHcHlKrk8VdDxTkjymYHTVS0PvTvMZGV+S9EfKAbM283EQaJCj94CaC sPhjj9h+XdP9Y2zLXiDf6zAzNOqC4ioXO0Mld3HKHtklQLvX2wrD6oyeWSQD3HCXa5sdol tBjrpCZ7GZp3loOAXd4L3yajopBJF1sHChK22Hx0PlzfmHsF/TkAkQrS3aP+oNG3SnBkj+ s4AIRGaNXh5yn5f4bY+w7CChYlqGhhcXNYDRJJEcc3eWKkQLgA/HDuzhAWNNvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666874585; a=rsa-sha256; cv=none; b=E7eOnmwsxX6P2F1atXokd9GdzB4ZEZ5709DVKSXkdbRvONoCcjWlbMIJklDU1PA6KTdPXq /u6uf1o1VbwJ/yNfuY3XkhFNp8LZ7LxJRCUc1FPsIQSmAJFBQfs6mNC4wLZft2i5SmQvfM rSlhsP+byktzG3OLJuemIIk3+b6cYjlR78cfG+Lnj8kFdu80zvRdENInJRnpXvSHv5nRN7 ZJqAfNw8ImiKLICEke6SzyJ4MZn/gwPUNagF4PksxyW0FAgZ5oA6ne9gOpO6pOD0/0LuYn MVrqvIrCXiOH9rx09wCtMNy9SEC3rIcniH97frxJBefURgj0KU1inQsEVYo87Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ce3a386d627d808997959971132c149ea6ce9d43 commit ce3a386d627d808997959971132c149ea6ce9d43 Author: Mark Johnston AuthorDate: 2022-10-27 12:42:08 +0000 Commit: Mark Johnston CommitDate: 2022-10-27 12:42:54 +0000 zfs: Fix the build ZFS_ENTER changed between main and stable/13. This is a direct commit to stable/13. Fixes: 562c9ac58c76 ("zfs: Fix a pair of bugs in zfs_fhtovp()") Reported by: Jenkins --- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c index 928cd83dfea0..05d41d4e3b2a 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c @@ -1846,7 +1846,7 @@ zfs_fhtovp(vfs_t *vfsp, fid_t *fidp, int flags, vnode_t **vpp) } if (fidp->fid_len == LONG_FID_LEN && setgen != 0) { - zfs_exit(zfsvfs, FTAG); + ZFS_EXIT(zfsvfs); dprintf("snapdir fid: fid_gen (%llu) and setgen (%llu)\n", (u_longlong_t)fid_gen, (u_longlong_t)setgen); return (SET_ERROR(EINVAL));