X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=lib%2Flibzpool%2Fkernel.c;h=69fbd44cd1ff03612caec37db11754538caf59b7;hb=cb2d19010d8fbcf6c22585cd8763fad3ba7db724;hp=6f06f4001293309d03aa0b400859e88d6aed7654;hpb=d603ed6c278f9c25b17ba8e75e9bce6e5d715ac0;p=zfs.git

diff --git a/lib/libzpool/kernel.c b/lib/libzpool/kernel.c
index 6f06f40..69fbd44 100644
--- a/lib/libzpool/kernel.c
+++ b/lib/libzpool/kernel.c
@@ -36,7 +36,6 @@
 #include <sys/zfs_context.h>
 #include <sys/utsname.h>
 #include <sys/time.h>
-#include <sys/mount.h> /* for BLKGETSIZE64 */
 #include <sys/systeminfo.h>
 
 /*
@@ -592,22 +591,12 @@ 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);
 	}
 
-#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);
@@ -699,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
@@ -823,8 +812,6 @@ __dprintf(const char *file, const char *func, int line, const char *fmt, ...)
 	}
 }
 
-#endif /* ZFS_DEBUG */
-
 /*
  * =========================================================================
  * cmn_err() and panic()