From owner-svn-src-all@FreeBSD.ORG  Tue Jun  9 03:35:43 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 54F401065674;
	Tue,  9 Jun 2009 03:35:43 +0000 (UTC)
	(envelope-from bland@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 433FA8FC08;
	Tue,  9 Jun 2009 03:35:43 +0000 (UTC)
	(envelope-from bland@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n593ZhqA054387;
	Tue, 9 Jun 2009 03:35:43 GMT (envelope-from bland@svn.freebsd.org)
Received: (from bland@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n593Zh39054386;
	Tue, 9 Jun 2009 03:35:43 GMT (envelope-from bland@svn.freebsd.org)
Message-Id: <200906090335.n593Zh39054386@svn.freebsd.org>
From: Alexander Nedotsukov <bland@FreeBSD.org>
Date: Tue, 9 Jun 2009 03:35:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193799 - head/usr.bin/fstat
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Jun 2009 03:35:43 -0000

Author: bland (ports committer)
Date: Tue Jun  9 03:35:42 2009
New Revision: 193799
URL: http://svn.freebsd.org/changeset/base/193799

Log:
  Chase ZFS v13 import changes.
  This is a temporary fix until we find a way to avoid fstat
  to be broken each time we change the znode.
  
  Approved by:	lulf

Modified:
  head/usr.bin/fstat/zfs.c

Modified: head/usr.bin/fstat/zfs.c
==============================================================================
--- head/usr.bin/fstat/zfs.c	Tue Jun  9 03:27:08 2009	(r193798)
+++ head/usr.bin/fstat/zfs.c	Tue Jun  9 03:35:42 2009	(r193799)
@@ -29,6 +29,7 @@
 #include <sys/param.h>
 #define _KERNEL
 #include <sys/mount.h>
+#include <sys/taskqueue.h>
 #undef _KERNEL
 #include <sys/sysctl.h>
 
@@ -57,7 +58,7 @@
  * definition.
  */
 #define LOCATION_ZID (2 * sizeof(void *))
-#define LOCATION_ZPHYS(zsize) ((zsize) - (2 * sizeof(void *)))
+#define LOCATION_ZPHYS(zsize) ((zsize) - (2 * sizeof(void *) - sizeof(struct task)))
 
 int
 zfs_filestat(struct vnode *vp, struct filestat *fsp)