Cleanly support debug packages

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

diff --git a/lib/libzpool/kernel.c b/lib/libzpool/kernel.c
index 494e544..69fbd44 100644 (file)
--- a/lib/libzpool/kernel.c
+++ b/lib/libzpool/kernel.c
@@ -35,6 +35,7 @@
 #include <sys/processor.h>
 #include <sys/zfs_context.h>
 #include <sys/utsname.h>
+#include <sys/time.h>
 #include <sys/systeminfo.h>
 
 /*
@@ -533,7 +534,11 @@ vn_open(char *path, int x1, int flags, int mode, vnode_t **vpp, int x2, int x3)
         * for its size.  So -- gag -- we open the block device to get
         * its size, and remember it for subsequent VOP_GETATTR().
         */
+#if defined(__sun__) || defined(__sun)
        if (strncmp(path, "/dev/", 5) == 0) {
+#else
+       if (0) {
+#endif
                char *dsk;
                fd = open64(path, O_RDONLY);
                if (fd == -1) {
@@ -562,6 +567,14 @@ vn_open(char *path, int x1, int flags, int mode, vnode_t **vpp, int x2, int x3)
                }
        }
 
+       if (!(flags & FCREAT) && S_ISBLK(st.st_mode)) {
+#ifdef __linux__
+               flags |= O_DIRECT;
+#endif
+               /* We shouldn't be writing to block devices in userspace */
+               VERIFY(!(flags & FWRITE));
+       }
+
        if (flags & FCREAT)
                old_umask = umask(0);
 
@@ -578,7 +591,7 @@ vn_open(char *path, int x1, int flags, int mode, vnode_t **vpp, int x2, int x3)
        if (fd == -1)
                return (errno);
 
-       if (fstat64(fd, &st) == -1) {
+       if (fstat64_blk(fd, &st) == -1) {
                err = errno;
                close(fd);
                return (err);
@@ -637,6 +650,16 @@ vn_rdwr(int uio, vnode_t *vp, void *addr, ssize_t len, offset_t offset,
                }
        }
 
+#ifdef __linux__
+       if (rc == -1 && errno == EINVAL) {
+               /*
+                * Under Linux, this most likely means an alignment issue
+                * (memory or disk) due to O_DIRECT, so we abort() in order to
+                * catch the offender.
+                */
+                abort();
+       }
+#endif
        if (rc == -1)
                return (errno);
 
@@ -665,18 +688,18 @@ int
 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
@@ -789,8 +812,6 @@ __dprintf(const char *file, const char *func, int line, const char *fmt, ...)
        }
 }
 
-#endif /* ZFS_DEBUG */
-
 /*
  * =========================================================================
  * cmn_err() and panic()