X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=lib%2Flibzpool%2Fkernel.c;h=002276a90db7feb6f7909fd64fdd8b932e8e2e87;hb=8a7e1ceefa430988c8f888ca708ab307333b4464;hp=4bd08cdd450e0fe193db076cae19d0c1864b1a3f;hpb=1e33ac1e2677c898a0b5ef6207048c692cb51bf4;p=zfs.git

diff --git a/lib/libzpool/kernel.c b/lib/libzpool/kernel.c
index 4bd08cd..002276a 100644
--- 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>
 
 /*
@@ -517,10 +518,12 @@ 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;
-	char realpath[MAXPATHLEN];
+	char *realpath;
 	struct stat64 st;
 	int err;
 
+	realpath = umem_alloc(MAXPATHLEN, UMEM_NOFAIL);
+
 	/*
 	 * If we're accessing a real disk from userland, we need to use
 	 * the character interface to avoid caching.  This is particularly
@@ -531,14 +534,23 @@ 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)
-			return (errno);
+		if (fd == -1) {
+			err = errno;
+			free(realpath);
+			return (err);
+		}
 		if (fstat64(fd, &st) == -1) {
+			err = errno;
 			close(fd);
-			return (errno);
+			free(realpath);
+			return (err);
 		}
 		close(fd);
 		(void) sprintf(realpath, "%s", path);
@@ -548,8 +560,19 @@ vn_open(char *path, int x1, int flags, int mode, vnode_t **vpp, int x2, int x3)
 			    dsk + 1);
 	} else {
 		(void) sprintf(realpath, "%s", path);
-		if (!(flags & FCREAT) && stat64(realpath, &st) == -1)
-			return (errno);
+		if (!(flags & FCREAT) && stat64(realpath, &st) == -1) {
+			err = errno;
+			free(realpath);
+			return (err);
+		}
+	}
+
+	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)
@@ -560,6 +583,7 @@ vn_open(char *path, int x1, int flags, int mode, vnode_t **vpp, int x2, int x3)
 	 * FREAD and FWRITE to the corresponding O_RDONLY, O_WRONLY, and O_RDWR.
 	 */
 	fd = open64(realpath, flags - FREAD, mode);
+	free(realpath);
 
 	if (flags & FCREAT)
 		(void) umask(old_umask);
@@ -567,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);
@@ -626,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);
 
@@ -654,10 +688,12 @@ 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;
@@ -1096,25 +1132,27 @@ ksiddomain_rele(ksiddomain_t *ksid)
 	umem_free(ksid, sizeof (ksiddomain_t));
 }
 
-/*
- * Do not change the length of the returned string; it must be freed
- * with strfree().
- */
 char *
-kmem_asprintf(const char *fmt, ...)
+kmem_vasprintf(const char *fmt, va_list adx)
 {
-	int size;
-	va_list adx;
-	char *buf;
+	char *buf = NULL;
+	va_list adx_copy;
 
-	va_start(adx, fmt);
-	size = vsnprintf(NULL, 0, fmt, adx) + 1;
-	va_end(adx);
+	va_copy(adx_copy, adx);
+	VERIFY(vasprintf(&buf, fmt, adx_copy) != -1);
+	va_end(adx_copy);
 
-	buf = kmem_alloc(size, KM_SLEEP);
+	return (buf);
+}
+
+char *
+kmem_asprintf(const char *fmt, ...)
+{
+	char *buf = NULL;
+	va_list adx;
 
 	va_start(adx, fmt);
-	size = vsnprintf(buf, size, fmt, adx);
+	VERIFY(vasprintf(&buf, fmt, adx) != -1);
 	va_end(adx);
 
 	return (buf);