c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 10:37:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix block device-related issues in zdb.

Browse Source 
Specifically, this fixes the two following errors in zdb when a pool
is composed of block devices:

1) 'Value too large for defined data type' when running 'zdb <dataset>'.
2) 'character device required' when running 'zdb -l <block-device>'.

Signed-off-by: Ricardo M. Correia <ricardo.correia@oracle.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
Ricardo M. Correia
2010-12-14 09:50:37 -08:00
committed by Brian Behlendorf
parent a7dc7e5d5a
commit 8d4e8140ef
5 changed files with 58 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/libzpool/kernel.c
+5 -14
View File
@@ -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,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;