git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add backing_device_info per-filesystem
[zfs.git]
/
lib
/
libzpool
/
kernel.c
diff --git
a/lib/libzpool/kernel.c
b/lib/libzpool/kernel.c
index
6f06f40
..
002276a
100644
(file)
--- 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/zfs_context.h>
#include <sys/utsname.h>
#include <sys/time.h>
-#include <sys/mount.h> /* for BLKGETSIZE64 */
#include <sys/systeminfo.h>
/*
#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 (fd == -1)
return (errno);
- if (fstat64(fd, &st) == -1) {
+ if (fstat64
_blk
(fd, &st) == -1) {
err = errno;
close(fd);
return (err);
}
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);
(void) fcntl(fd, F_SETFD, FD_CLOEXEC);
*vpp = vp = umem_zalloc(sizeof (vnode_t), UMEM_NOFAIL);
@@
-699,10
+688,12
@@
int
fop_getattr(vnode_t *vp, vattr_t *vap)
{
struct stat64 st;
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);
close(vp->v_fd);
- return (err
no
);
+ return (err);
}
vap->va_size = st.st_size;
}
vap->va_size = st.st_size;