Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 9 Jun 2009 21:17:57 +0000 (UTC)
From:      Kip Macy <kmacy@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject:   svn commit: r193858 - in stable/7/usr.bin/fstat: . zfs
Message-ID:  <200906092117.n59LHvPm084057@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kmacy
Date: Tue Jun  9 21:17:57 2009
New Revision: 193858
URL: http://svn.freebsd.org/changeset/base/193858

Log:
  MFC fstat support bits for ZFS
  
  Submitted by:	Alexander Nedotsukov

Added:
  stable/7/usr.bin/fstat/zfs/
  stable/7/usr.bin/fstat/zfs.c   (contents, props changed)
  stable/7/usr.bin/fstat/zfs/Makefile   (contents, props changed)
Modified:
  stable/7/usr.bin/fstat/Makefile
  stable/7/usr.bin/fstat/fstat.c
  stable/7/usr.bin/fstat/fstat.h

Modified: stable/7/usr.bin/fstat/Makefile
==============================================================================
--- stable/7/usr.bin/fstat/Makefile	Tue Jun  9 20:29:47 2009	(r193857)
+++ stable/7/usr.bin/fstat/Makefile	Tue Jun  9 21:17:57 2009	(r193858)
@@ -1,6 +1,8 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	fstat
 SRCS=	cd9660.c fstat.c msdosfs.c
 DPADD=	${LIBKVM}
@@ -11,4 +13,13 @@ WARNS?=	6
 
 CFLAGS+=-D_KVM_VNODE
 
+# XXX This is a hack.
+.if ${MK_CDDL} != "no"
+CFLAGS+= -DZFS
+OBJS+=	zfs/zfs.o
+SUBDIR=	zfs
+zfs/zfs.o: .PHONY
+	@cd ${.CURDIR}/zfs && ${MAKE} zfs.o
+.endif
+
 .include <bsd.prog.mk>

Modified: stable/7/usr.bin/fstat/fstat.c
==============================================================================
--- stable/7/usr.bin/fstat/fstat.c	Tue Jun  9 20:29:47 2009	(r193857)
+++ stable/7/usr.bin/fstat/fstat.c	Tue Jun  9 21:17:57 2009	(r193858)
@@ -525,6 +525,11 @@ vtrans(struct vnode *vp, int i, int flag
 		} else if (!strcmp("isofs", tagstr)) {
 			if (!isofs_filestat(&vn, &fst))
 				badtype = "error";
+#ifdef ZFS
+		} else if (!strcmp("zfs", tagstr)) {
+			if (!zfs_filestat(&vn, &fst))
+				badtype = "error";
+#endif
 		} else {
 			static char unknown[32];
 			snprintf(unknown, sizeof unknown, "?(%s)", tagstr);
@@ -939,6 +944,20 @@ getfname(const char *filename)
 	return(1);
 }
 
+#ifdef ZFS
+void *
+getvnodedata(struct vnode *vp)
+{
+	return (vp->v_data);
+}
+
+struct mount *
+getvnodemount(struct vnode *vp)
+{
+	return (vp->v_mount);
+}
+#endif
+
 void
 usage(void)
 {

Modified: stable/7/usr.bin/fstat/fstat.h
==============================================================================
--- stable/7/usr.bin/fstat/fstat.h	Tue Jun  9 20:29:47 2009	(r193857)
+++ stable/7/usr.bin/fstat/fstat.h	Tue Jun  9 21:17:57 2009	(r193858)
@@ -71,4 +71,10 @@ dev_t dev2udev(struct cdev *dev);
 int isofs_filestat(struct vnode *vp, struct filestat *fsp);
 int msdosfs_filestat(struct vnode *vp, struct filestat *fsp);
 
+#ifdef ZFS
+int zfs_filestat(struct vnode *vp, struct filestat *fsp);
+void *getvnodedata(struct vnode *vp);
+struct mount *getvnodemount(struct vnode *vp);
+#endif
+
 #endif /* __FSTAT_H__ */

Added: stable/7/usr.bin/fstat/zfs.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/7/usr.bin/fstat/zfs.c	Tue Jun  9 21:17:57 2009	(r193858)
@@ -0,0 +1,135 @@
+/*-
+ * Copyright (c) 2007 Ulf Lilleengen
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#include <sys/param.h>
+#define _KERNEL
+#include <sys/mount.h>
+#include <sys/taskqueue.h>
+#undef _KERNEL
+#include <sys/sysctl.h>
+
+#undef lbolt
+#undef lbolt64
+#undef gethrestime_sec
+#include <sys/zfs_context.h>
+#include <sys/spa.h>
+#include <sys/spa_impl.h>
+#include <sys/dmu.h>
+#include <sys/zap.h>
+#include <sys/fs/zfs.h>
+#include <sys/zfs_znode.h>
+
+#include <err.h>
+#include <kvm.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#define ZFS
+#undef dprintf
+#include <fstat.h>
+
+/* 
+ * Offset calculations that are used to get data from znode without having the
+ * definition.
+ */
+#define LOCATION_ZID (2 * sizeof(void *))
+#define LOCATION_ZPHYS(zsize) ((zsize) - (2 * sizeof(void *)) - sizeof(struct task))
+
+int
+zfs_filestat(struct vnode *vp, struct filestat *fsp)
+{
+
+	znode_phys_t zphys;
+	struct mount mount, *mountptr;
+	uint64_t *zid;
+	void *znodeptr, *vnodeptr;
+	char *dataptr;
+	void *zphys_addr;
+	size_t len;
+	int size;
+
+	len = sizeof(size);
+	if (sysctlbyname("debug.sizeof.znode", &size, &len, NULL, 0) == -1) {
+		dprintf(stderr, "error getting sysctl\n");
+		return (0);
+	}
+	znodeptr = malloc(size);
+	if (znodeptr == NULL) {
+		dprintf(stderr, "error allocating memory for znode storage\n");
+		return (0);
+	}
+
+	/* Since we have problems including vnode.h, we'll use the wrappers. */
+	vnodeptr = getvnodedata(vp);
+	if (!KVM_READ(vnodeptr, znodeptr, (size_t)size)) {
+		dprintf(stderr, "can't read znode at %p for pid %d\n",
+		    (void *)vnodeptr, Pid);
+		goto bad;
+	}
+
+	/* 
+	 * z_id field is stored in the third pointer. We therefore skip the two
+	 * first bytes. 
+	 *
+	 * Pointer to the z_phys structure is the next last pointer. Therefore
+	 * go back two bytes from the end.
+	 */
+	dataptr = znodeptr;
+	zid = (uint64_t *)(dataptr + LOCATION_ZID);
+	zphys_addr = *(void **)(dataptr + LOCATION_ZPHYS(size));
+
+	if (!KVM_READ(zphys_addr, &zphys, sizeof(zphys))) {
+		dprintf(stderr, "can't read znode_phys at %p for pid %d\n",
+		    zphys_addr, Pid);
+		goto bad;
+	}
+
+	/* Get the mount pointer, and read from the address. */
+	mountptr = getvnodemount(vp);
+	if (!KVM_READ(mountptr, &mount, sizeof(mount))) {
+		dprintf(stderr, "can't read mount at %p for pid %d\n",
+		    (void *)mountptr, Pid);
+		goto bad;
+	}
+
+	fsp->fsid = (long)mount.mnt_stat.f_fsid.val[0];
+	fsp->fileid = *zid;
+	/*
+	 * XXX: Shows up wrong in output, but UFS has this error too. Could
+	 * be that we're casting mode-variables from 64-bit to 8-bit or simply
+	 * error in the mode-to-string function.
+	 */
+	fsp->mode = (mode_t)zphys.zp_mode;
+	fsp->size = (u_long)zphys.zp_size;
+	fsp->rdev = (dev_t)zphys.zp_rdev;
+	free(znodeptr);
+	return (1);
+bad:
+	free(znodeptr);
+	return (0);
+}

Added: stable/7/usr.bin/fstat/zfs/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/7/usr.bin/fstat/zfs/Makefile	Tue Jun  9 21:17:57 2009	(r193858)
@@ -0,0 +1,23 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/..
+
+SRCS=	zfs.c
+OBJS=	zfs.o
+WARNS?=	1
+
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/..
+CFLAGS+= -DNEED_SOLARIS_BOOLEAN
+
+all: ${OBJS}
+CLEANFILES= ${OBJS}
+
+.include <bsd.lib.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906092117.n59LHvPm084057>