aboutsummaryrefslogtreecommitdiff
path: root/sys/contrib/openzfs/lib/libzpool/kernel.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/contrib/openzfs/lib/libzpool/kernel.c')
-rw-r--r--sys/contrib/openzfs/lib/libzpool/kernel.c20
1 files changed, 4 insertions, 16 deletions
diff --git a/sys/contrib/openzfs/lib/libzpool/kernel.c b/sys/contrib/openzfs/lib/libzpool/kernel.c
index e397fc851cc1..e63153a03370 100644
--- a/sys/contrib/openzfs/lib/libzpool/kernel.c
+++ b/sys/contrib/openzfs/lib/libzpool/kernel.c
@@ -369,7 +369,7 @@ cv_timedwait(kcondvar_t *cv, kmutex_t *mp, clock_t abstime)
if (delta <= 0)
return (-1);
- VERIFY(gettimeofday(&tv, NULL) == 0);
+ VERIFY0(gettimeofday(&tv, NULL));
ts.tv_sec = tv.tv_sec + delta / hz;
ts.tv_nsec = tv.tv_usec * NSEC_PER_USEC + (delta % hz) * (NANOSEC / hz);
@@ -1025,25 +1025,13 @@ spl_fstrans_unmark(fstrans_cookie_t cookie)
}
int
-__spl_pf_fstrans_check(void)
-{
- return (0);
-}
-
-int
kmem_cache_reap_active(void)
{
return (0);
}
void
-zvol_create_minor(const char *name)
-{
- (void) name;
-}
-
-void
-zvol_create_minors_recursive(const char *name)
+zvol_create_minors(const char *name)
{
(void) name;
}
@@ -1073,8 +1061,8 @@ zvol_rename_minors(spa_t *spa, const char *oldname, const char *newname,
int
zfs_file_open(const char *path, int flags, int mode, zfs_file_t **fpp)
{
- int fd = -1;
- int dump_fd = -1;
+ int fd;
+ int dump_fd;
int err;
int old_umask = 0;
zfs_file_t *fp;