From 2867905cf5fd8d436fd8a9bb7324edcef658356f Mon Sep 17 00:00:00 2001 From: simokawa Date: Sat, 14 Apr 2007 14:39:38 +0000 Subject: In FreeBSD, - cv_timedwait() takes delta instead of absolute time, - we need ioctl() for mediasize. Reviewed by: pjd --- cddl/contrib/opensolaris/lib/libzpool/common/kernel.c | 7 +++++-- cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'cddl') diff --git a/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c b/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c index 1fafe5f..30c5a0c 100644 --- a/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c +++ b/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c @@ -291,7 +291,7 @@ cv_timedwait(kcondvar_t *cv, kmutex_t *mp, clock_t abstime) ASSERT(abstime > 0); top: - delta = abstime - lbolt; + delta = abstime; if (delta <= 0) return (-1); @@ -413,7 +413,10 @@ vn_open(char *path, int x1, int flags, int mode, vnode_t **vpp, int x2, int x3) *vpp = vp = umem_zalloc(sizeof (vnode_t), UMEM_NOFAIL); vp->v_fd = fd; - vp->v_size = st.st_size; + if (S_ISCHR(st.st_mode)) + ioctl(fd, DIOCGMEDIASIZE, &vp->v_size); + else + vp->v_size = st.st_size; vp->v_path = spa_strdup(path); return (0); diff --git a/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h b/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h index d46948e..82a0767 100644 --- a/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h +++ b/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h @@ -80,6 +80,7 @@ extern "C" { #include #include #include +#include #include #define ZFS_EXPORTS_PATH "/etc/zfs/exports" -- cgit v1.1