Silence 'old_umask' uninit variable warning

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

diff --git a/lib/libzpool/kernel.c b/lib/libzpool/kernel.c
index c38efd0..f7aeeb4 100644 (file)
--- a/lib/libzpool/kernel.c
+++ b/lib/libzpool/kernel.c
@@ -175,8 +175,7 @@ zk_thread_create(caddr_t stk, size_t stksize, thread_func_t func, void *arg,
         * on Linux.
         */
 
-       stack = PTHREAD_STACK_MIN + MAX(stksize, STACK_SIZE) * 4 +
-                       EXTRA_GUARD_BYTES;
+       stack = PTHREAD_STACK_MIN + MAX(stksize, STACK_SIZE) * 4;
 
        VERIFY3S(pthread_attr_init(&attr), ==, 0);
        VERIFY3S(pthread_attr_setstacksize(&attr, stack), ==, 0);
@@ -523,7 +522,7 @@ vn_open(char *path, int x1, int flags, int mode, vnode_t **vpp, int x2, int x3)
 {
        int fd;
        vnode_t *vp;
-       int old_umask;
+       int old_umask = 0;
        char *realpath;
        struct stat64 st;
        int err;
@@ -647,7 +646,9 @@ vn_rdwr(int uio, vnode_t *vp, void *addr, ssize_t len, offset_t offset,
                 * To simulate partial disk writes, we split writes into two
                 * system calls so that the process can be killed in between.
                 */
-               split = (len > 0 ? rand() % len : 0);
+               int sectors = len >> SPA_MINBLOCKSHIFT;
+               split = (sectors > 0 ? rand() % sectors : 0) <<
+                   SPA_MINBLOCKSHIFT;
                rc = pwrite64(vp->v_fd, addr, split, offset);
                if (rc != -1) {
                        done = rc;