From owner-svn-src-all@FreeBSD.ORG  Sat Aug 13 10:58:53 2011
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 935A9106566C;
	Sat, 13 Aug 2011 10:58:53 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 81F548FC16;
	Sat, 13 Aug 2011 10:58:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p7DAwrlX010961;
	Sat, 13 Aug 2011 10:58:53 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7DAwrUU010959;
	Sat, 13 Aug 2011 10:58:53 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201108131058.p7DAwrUU010959@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Sat, 13 Aug 2011 10:58:53 +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: r224814 -
	head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
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: Sat, 13 Aug 2011 10:58:53 -0000

Author: mm
Date: Sat Aug 13 10:58:53 2011
New Revision: 224814
URL: http://svn.freebsd.org/changeset/base/224814

Log:
  Fix race between dmu_objset_prefetch() invoked from
  zfs_ioc_dataset_list_next() and dsl_dir_destroy_check() indirectly
  invoked from dmu_recv_existing_end() via dsl_dataset_destroy() by not
  prefetching temporary clones, as these count as always inconsistent.
  In addition, do not prefetch hidden datasets at all as we are not
  going to process these later.
  
  Filed as Illumos Bug #1346
  
  PR:		kern/157728
  Tested by:	Borja Marcos <borjam@sarenet.es>, mm
  Reviewed by:	pjd
  Approved by:	re (kib)
  MFC after:	1 week

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c	Sat Aug 13 10:43:56 2011	(r224813)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c	Sat Aug 13 10:58:53 2011	(r224814)
@@ -1964,7 +1964,8 @@ top:
 		int len = sizeof (zc->zc_name) - (p - zc->zc_name);
 
 		while (dmu_dir_list_next(os, len, p, NULL, &cookie) == 0)
-			(void) dmu_objset_prefetch(zc->zc_name, NULL);
+			if (dataset_name_hidden(zc->zc_name) == B_FALSE)
+				(void) dmu_objset_prefetch(zc->zc_name, NULL);
 	}
 
 	do {