Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 3 May 2023 10:41:11 GMT
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 387546f14b63 - stable/13 - zfs: make zfs_vfs_held() definition consistent with declaration
Message-ID:  <202305031041.343AfBb9092474@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=387546f14b638e07df72ef35589fb43d4309d294

commit 387546f14b638e07df72ef35589fb43d4309d294
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2023-04-25 17:43:48 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305031041.343AfBb9092474>