#include <sys/zfs_context.h>
#include <sys/utsname.h>
#include <sys/time.h>
-#include <sys/mount.h> /* for BLKGETSIZE64 */
#include <sys/systeminfo.h>
/*
kthread_t *
zk_thread_create(caddr_t stk, size_t stksize, thread_func_t func, void *arg,
- size_t len, proc_t *pp, int state, pri_t pri)
+ size_t len, proc_t *pp, int state, pri_t pri, int detachstate)
{
kthread_t *kt;
pthread_attr_t attr;
*
* We reduce the default stack size in userspace, to ensure
* we observe stack overruns in user space as well as in
- * kernel space. PTHREAD_STACK_MIN is the minimum stack
- * required for a NULL procedure in user space and is added
- * in to the stack requirements.
+ * kernel space. In practice we can't set the userspace stack
+ * size to 8k because differences in stack usage between kernel
+ * space and userspace could lead to spurious stack overflows
+ * (especially when debugging is enabled). Nevertheless, we try
+ * to set it to the lowest value that works (currently 8k*4).
+ * PTHREAD_STACK_MIN is the minimum stack required for a NULL
+ * procedure in user space and is added in to the stack
+ * requirements.
*
* Some buggy NPTL threading implementations include the
* guard area within the stack size allocations. In
* on Linux.
*/
- stack = PTHREAD_STACK_MIN + MAX(stksize, STACK_SIZE) +
+ stack = PTHREAD_STACK_MIN + MAX(stksize, STACK_SIZE) * 4 +
EXTRA_GUARD_BYTES;
VERIFY3S(pthread_attr_init(&attr), ==, 0);
VERIFY3S(pthread_attr_setstacksize(&attr, stack), ==, 0);
VERIFY3S(pthread_attr_setguardsize(&attr, PAGESIZE), ==, 0);
+ VERIFY3S(pthread_attr_setdetachstate(&attr, detachstate), ==, 0);
VERIFY3S(pthread_create(&kt->t_tid, &attr, &zk_thread_helper, kt),
==, 0);
if (fd == -1)
return (errno);
- if (fstat64(fd, &st) == -1) {
+ if (fstat64_blk(fd, &st) == -1) {
err = errno;
close(fd);
return (err);
}
-#ifdef __linux__
- /* In Linux, use an ioctl to get the size of a block device. */
- if (S_ISBLK(st.st_mode)) {
- if (ioctl(fd, BLKGETSIZE64, &st.st_size) != 0) {
- err = errno;
- close(fd);
- return (err);
- }
- }
-#endif
(void) fcntl(fd, F_SETFD, FD_CLOEXEC);
*vpp = vp = umem_zalloc(sizeof (vnode_t), UMEM_NOFAIL);
fop_getattr(vnode_t *vp, vattr_t *vap)
{
struct stat64 st;
+ int err;
- if (fstat64(vp->v_fd, &st) == -1) {
+ if (fstat64_blk(vp->v_fd, &st) == -1) {
+ err = errno;
close(vp->v_fd);
- return (errno);
+ return (err);
}
vap->va_size = st.st_size;
return (0);
}
-#ifdef ZFS_DEBUG
-
/*
* =========================================================================
* Figure out which debugging statements to print
}
}
-#endif /* ZFS_DEBUG */
-
/*
* =========================================================================
* cmn_err() and panic()