From owner-cvs-src-old@FreeBSD.ORG Thu Jan 7 20:10:38 2010 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AE7291065709 for ; Thu, 7 Jan 2010 20:10:38 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9C2BF8FC12 for ; Thu, 7 Jan 2010 20:10:38 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o07KAc4j019324 for ; Thu, 7 Jan 2010 20:10:38 GMT (envelope-from delphij@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o07KAcfG019323 for cvs-src-old@freebsd.org; Thu, 7 Jan 2010 20:10:38 GMT (envelope-from delphij@repoman.freebsd.org) Message-Id: <201001072010.o07KAcfG019323@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to delphij@repoman.freebsd.org using -f From: Xin LI Date: Thu, 7 Jan 2010 20:10:22 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs dmu_send.c X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jan 2010 20:10:38 -0000 delphij 2010-01-07 20:10:22 UTC FreeBSD src repository Modified files: sys/cddl/contrib/opensolaris/uts/common/fs/zfs dmu_send.c Log: SVN rev 201756 on 2010-01-07 20:10:22Z by delphij Re-apply onnv-gate revisions 7994 and 8986 (corresponds to FreeBSD revision 200726 and 200727). It looks like that the two revisions were not applied in the right sequence, I found this when comparing with the OpenSolaris code. MFC after: 3 days Reviewed by: mm@ Revision Changes Path 1.8 +6 -7 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c