Minor tweak to update script

[zfs.git] / zfs / lib / libzpool / kernel.c

diff --git a/zfs/lib/libzpool/kernel.c b/zfs/lib/libzpool/kernel.c
index 7131744..fe817cc 100644 (file)
--- a/zfs/lib/libzpool/kernel.c
+++ b/zfs/lib/libzpool/kernel.c
@@ -23,8 +23,6 @@
  * Use is subject to license terms.
  */
 
-
-
 #include <assert.h>
 #include <fcntl.h>
 #include <poll.h>
@@ -186,9 +184,9 @@ rw_enter(krwlock_t *rwlp, krw_t rw)
        ASSERT(rwlp->rw_owner != curthread);
 
        if (rw == RW_READER)
-               (void) rw_rdlock(&rwlp->rw_lock);
+               VERIFY(rw_rdlock(&rwlp->rw_lock) == 0);
        else
-               (void) rw_wrlock(&rwlp->rw_lock);
+               VERIFY(rw_wrlock(&rwlp->rw_lock) == 0);
 
        rwlp->rw_owner = curthread;
 }
@@ -200,7 +198,7 @@ rw_exit(krwlock_t *rwlp)
        ASSERT(rwlp->rw_owner != (void *)-1UL);
 
        rwlp->rw_owner = NULL;
-       (void) rw_unlock(&rwlp->rw_lock);
+       VERIFY(rw_unlock(&rwlp->rw_lock) == 0);
 }
 
 int
@@ -428,7 +426,7 @@ vn_rdwr(int uio, vnode_t *vp, void *addr, ssize_t len, offset_t offset,
                    len - split, offset + split);
        }
 
-       if (iolen < 0)
+       if (iolen == -1)
                return (errno);
        if (residp)
                *residp = len - iolen;
@@ -780,12 +778,13 @@ kernel_init(int mode)
        dprintf("physmem = %llu pages (%.2f GB)\n", physmem,
            (double)physmem * sysconf(_SC_PAGE_SIZE) / (1ULL << 30));
 
-       uname(&utsname);
        snprintf(hw_serial, sizeof (hw_serial), "%ld", gethostid());
 
        VERIFY((random_fd = open("/dev/random", O_RDONLY)) != -1);
        VERIFY((urandom_fd = open("/dev/urandom", O_RDONLY)) != -1);
 
+       system_taskq_init();
+
        spa_init(mode);
 }
 
@@ -826,14 +825,6 @@ z_compress_level(void *dst, size_t *dstlen, const void *src, size_t srclen,
        return (ret);
 }
 
-/*ARGSUSED*/
-size_t u8_textprep_str(char *i, size_t *il, char *o, size_t *ol, int nf,
-    size_t vers, int *err)
-{
-       *err = EINVAL;
-       return ((size_t)-1);
-}
-
 uid_t
 crgetuid(cred_t *cr)
 {