From nobody Tue Apr 25 17:59:13 2023 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 4Q5VB92crRz46VDg; Tue, 25 Apr 2023 17:59:13 +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 4Q5VB9259bz47V4; Tue, 25 Apr 2023 17:59:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682445553; 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=gSZ+lC5l/ltEY2M1pdWpPOvIfTErAKLxk0d1iJA0Vco=; b=JueSWkArTBZSVRx43jpw8Pj4SIitq+nVawWrDo1WHRIhD9hekxPxR7NuDVnkz0MT/2fj6w nBxjx37lawGOJ0lxZLq9nbg1c804y/QqrXvtTvtFW+GPLVLBuqlnx43X6BcouWhgvj45Kh EdQmwM/qMlToQ0lVuyklip0k4Qh1H1ByCWFygzRWANimR0/xGXTu/z6U1TMYkOvRA6JO/T WNHJbiOPCELsbu+w1LRbPK495ghAK/z4SsAvmgbq3n5EgdGkrakjJ31Qvk6DmgTpxK21AF aTzdj6E0hUBT4b0wyJ3IHGjl6uy2UWsckseF8S+gV95vaIoNdTZngo62crxo2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682445553; 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=gSZ+lC5l/ltEY2M1pdWpPOvIfTErAKLxk0d1iJA0Vco=; b=m7JOjBSO+5Okz9XCXhgVli1UUfT6T8rzRENsyhYnfomID0MMEVEomxFXymlxC2h108xMNO jIHBqIMHQR6sCqrLR8o9G4479flYy/lyidk/LC1pIdNVPuiVQCpFKTEZs09Vu5fy7AAR8k FTDoEFkr5xl+lXC4aaeHJ48QIzGAIGBCiDaPUAS/iQW8aXpSs3zroyl1c2wvsnzdllEbkE 5kpOon9SqIIeKJT07NZOwMgYH/Y1oF059D7oviar80ac1pKGxwmN5sh0be/Y8fp6yAxGV6 sfE2uHyNEQtLH8e+xlHPZliWQbHN8nShICKA5lVrM5VoIdgqJ1va5vEYBIQQmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682445553; a=rsa-sha256; cv=none; b=peDF1yfXl0kJn/NoZNJpKG8feeLCy6oNu6AUe0tip/Yf357KHsQWUNDJzv6H9h1gDDg3rl ZWw8vi0TXL/SjUM2tU23Oe6hfWMtl/C9v5m0/LkIsGsWE/6Ldd30JT06Iey9MIxLQH+LcH 99r2g/qMhx01xjiuB7xCjic21j9vFGbsHSNR67TQMGRhE1mbH84rR8v/tCrttF7ig1rMma R5mTwwePRRD+KFssHsA/VUDaPSLAWbx0ZrmsWKhZ+2mghL+sbgrRwdnTc+0EnO/eOEhL65 IEKYEwDywqwTPex4/6ExkUn1colD6/e/p6HTWfMwTcsrNYe227eoXLSxUYBMpA== 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 4Q5VB918jBz1GnR; Tue, 25 Apr 2023 17:59:13 +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 33PHxDt3078847; Tue, 25 Apr 2023 17:59:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33PHxD1r078846; Tue, 25 Apr 2023 17:59:13 GMT (envelope-from git) Date: Tue, 25 Apr 2023 17:59:13 GMT Message-Id: <202304251759.33PHxD1r078846@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 64b5d74fffc8 - main - zfs: make zfs_vfs_held() definition consistent with declaration 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 64b5d74fffc8882d915e6e8de7e5fc893c606213 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=64b5d74fffc8882d915e6e8de7e5fc893c606213 commit 64b5d74fffc8882d915e6e8de7e5fc893c606213 Author: Dimitry Andric AuthorDate: 2023-04-25 17:43:48 +0000 Commit: Dimitry Andric CommitDate: 2023-04-25 17:58:17 +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 --- 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 8f44cced5d95..a835e013d630 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);