From nobody Wed May 3 10:41:11 2023 X-Original-To: dev-commits-src-branches@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 4QBD5400tCz49C9t; Wed, 3 May 2023 10:41:12 +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 4QBD536BZPz3PZG; Wed, 3 May 2023 10:41:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683110471; 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=I1YRtQu3/teRW4eVVCyyfdY48wtEJdnBf4kykWiELHw=; b=EurN1iElF4gxiYYI7F/TjbmXiH0uuv51uWHTWb85oWW6MSvBkrMhJ4At9BXAfYxSztRKmS 3Kc4O/MkM/6wnEyHZGpq1QDesfvrjBk7zVC3/UsMcaRGU7UBjcWz4rzauBG/eSr7jL0Yao GbIhSKB/oYP6P6SSRyAAvaTq3jIqixeekQcWAkb5pXZlpSt0atkWRVYhWqVioKb8hoHb9S 3sCdmPJzJ/lc19aSr7L87HdUU54aRV6qxPyqzwuizk/cbYjmXwIjynNj4lLkvtfoSbVgCx M/wmvUyKZa4owitBUJRlXYIc6jVyYlsjBzWTePiEk/FZNRwwgrNZJfA7c54PzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683110471; 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=I1YRtQu3/teRW4eVVCyyfdY48wtEJdnBf4kykWiELHw=; b=lRtKaHUHNcicAQdEC5rqSEri1ZK69nW2Be9N7imwbhrcKEkZoz3hcWMOgSawS/2OUgCEQe EUmqpBdZLmXrS4r0MCt8HcWxLvxEvqozZSJRH4K2AjTLaSdCMSVrcgCbuqSS8Cx3x3ag3E /TK32BxOy25xgI9ZOJu1saEXOF8tJbOzudI/1epjjNDi/wKw04aRBF1QzYKMTp9EPYGe27 63FY7HUTFaKdoxiIMBTuEocR1o6+lYoaRWuQ1aPMyr+BFcdn2SDPKgSgFdP/OJxgD8JDnK ddtgvUG0yJzy0DIRtC82BTPEVOBleDrp2VCkWQrm/U15yYf1+NyBhRmvoGW1Wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683110471; a=rsa-sha256; cv=none; b=teX0SLGsbMlaqkWih7nbBQXqbLI7UySvaRcc03ZSVNqLNlGfZgZjX9vHt66+QQ0f3sRXKg zymelANfPcGvdbVY5h/JM6VCvCaM7fZqqO6GLwnJgJEiC28ZW6K46UTn91h6FPGJ19wEn/ OP8gbX32wr9HmhHLEi3neOjrTRkbq7+nFs1NsKmM1ijoIjkr9UlHn3Kii5o1i4DDYchhAY 9xCBmCOur0feZPvqI1I/ammQNSBHEvrPSQGaLW3mxh7Bgmmbgl/O1xJ4qx82JgUzmv6nbx aYED37mm/gVMeHTIUwGcYrCQJN09PDG9rHdu/rKp8wP4A5nMvOKV16MhGOOA9A== 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 4QBD5350LlzRh1; Wed, 3 May 2023 10:41:11 +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 343AfBvV092475; Wed, 3 May 2023 10:41:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 343AfBb9092474; Wed, 3 May 2023 10:41:11 GMT (envelope-from git) Date: Wed, 3 May 2023 10:41:11 GMT Message-Id: <202305031041.343AfBb9092474@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 387546f14b63 - stable/13 - zfs: make zfs_vfs_held() definition consistent with declaration List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 387546f14b638e07df72ef35589fb43d4309d294 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=387546f14b638e07df72ef35589fb43d4309d294 commit 387546f14b638e07df72ef35589fb43d4309d294 Author: Dimitry Andric AuthorDate: 2023-04-25 17:43:48 +0000 Commit: Dimitry Andric CommitDate: 2023-05-03 08:18:52 +0000 zfs: make zfs_vfs_held() definition consistent with declaration Noticed while attempting to change boolean_t into an actual bool: in include/sys/zfs_ioctl_impl.h, zfs_vfs_held() is declared to return a boolean_t, but in module/os/freebsd/zfs/zfs_ioctl_os.c it is defined to return an int. Make the definition match the declaration. Obtained from: https://github.com/openzfs/zfs/commit/62cc9d4f6 Reviewed by: jhb MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39753 (cherry picked from commit 64b5d74fffc8882d915e6e8de7e5fc893c606213) --- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ioctl_os.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ioctl_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ioctl_os.c index 7f7e2b72c51a..effc11518c57 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ioctl_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ioctl_os.c @@ -59,7 +59,7 @@ zfs_vfs_ref(zfsvfs_t **zfvp) return (error); } -int +boolean_t zfs_vfs_held(zfsvfs_t *zfsvfs) { return (zfsvfs->z_vfs != NULL);