From owner-freebsd-fs@FreeBSD.ORG  Wed Aug 20 16:19:30 2008
Return-Path: <owner-freebsd-fs@FreeBSD.ORG>
Delivered-To: freebsd-fs@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A72B6106568B
	for <freebsd-fs@freebsd.org>; Wed, 20 Aug 2008 16:19:30 +0000 (UTC)
	(envelope-from caelian@gmail.com)
Received: from ug-out-1314.google.com (ug-out-1314.google.com [66.249.92.173])
	by mx1.freebsd.org (Postfix) with ESMTP id 332F18FC28
	for <freebsd-fs@freebsd.org>; Wed, 20 Aug 2008 16:19:29 +0000 (UTC)
	(envelope-from caelian@gmail.com)
Received: by ug-out-1314.google.com with SMTP id o4so750472uge.39
	for <freebsd-fs@freebsd.org>; Wed, 20 Aug 2008 09:19:28 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:received:received:message-id:date:from:to
	:subject:cc:in-reply-to:mime-version:content-type
	:content-transfer-encoding:content-disposition:references;
	bh=h7AXGVxbAdYwYrU59hSm9D0ECCrfc5odc6B5YCR5svk=;
	b=MvZzpuGK7Z3ihOdszvZmQQXHZNbLoU4fh/5TABfxhzY0dlGGXPTx+UyHqNuiaOuTiq
	hvwtThAHJAfbOcdG4Y9MyESRDQOhNaqtU8Vac9jgnG8mwkNeYVkByfud9pNERPWoX0On
	QqvaL6jkewt0VOSp7zB559I44vhEBUkZQSSII=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=message-id:date:from:to:subject:cc:in-reply-to:mime-version
	:content-type:content-transfer-encoding:content-disposition
	:references;
	b=w03MThA4fSjEafbx0lF9NqOTtoYLAqqbGTVI4UrRgZhct7g97Fswxjcs7o39hltbql
	YqDnN/f6yG2DmPyFRX5OgCJbw6x9EgM3hb4e9yCHGBym6xCqzDwa8nyW5boqBBqibGzq
	fKWj02h4mtVHacWyznkMKcC9mM39BxG0VV2E0=
Received: by 10.210.71.12 with SMTP id t12mr327047eba.36.1219249168703;
	Wed, 20 Aug 2008 09:19:28 -0700 (PDT)
Received: by 10.210.44.20 with HTTP; Wed, 20 Aug 2008 09:19:28 -0700 (PDT)
Message-ID: <d8a0b7620808200919o635a8ea4k5c47be2894a89cc8@mail.gmail.com>
Date: Wed, 20 Aug 2008 18:19:28 +0200
From: "Pascal Hofstee" <caelian@gmail.com>
To: "Pawel Jakub Dawidek" <pjd@freebsd.org>
In-Reply-To: <20080727125413.GG1345@garage.freebsd.pl>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <20080727125413.GG1345@garage.freebsd.pl>
Cc: freebsd-fs@freebsd.org, freebsd-current@freebsd.org
Subject: Re: ZFS patches.
X-BeenThere: freebsd-fs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Filesystems <freebsd-fs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-fs>,
	<mailto:freebsd-fs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-fs>
List-Post: <mailto:freebsd-fs@freebsd.org>
List-Help: <mailto:freebsd-fs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-fs>,
	<mailto:freebsd-fs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Aug 2008 16:19:30 -0000

On Sun, Jul 27, 2008 at 2:54 PM, Pawel Jakub Dawidek <pjd@freebsd.org> wrote:
> Hi.
>
>        http://people.freebsd.org/~pjd/patches/zfs_20080727.patch.bz2

Just thought i'd give a slight HEADS UP for those of us running with
this ZFS patch.
With the recent VIMAGE code having hit the CURRENT source tree, the above patch
fails to apply in a single (very minor way) in sys/kern/kern_jail.c

contents of sys/kern/kern_jail.c.rej

***************
*** 34,39 ****
  #include <sys/syscallsubr.h>
  #include <sys/sysctl.h>
  #include <sys/vnode.h>
  #include <net/if.h>
  #include <netinet/in.h>

--- 34,40 ----
  #include <sys/syscallsubr.h>
  #include <sys/sysctl.h>
  #include <sys/vnode.h>
+ #include <sys/osd.h>
  #include <net/if.h>
  #include <netinet/in.h>


The above rejection is caused by the inclusion of the <sys/vimage.h> header
immediately after the <sys/vnode.h> inclusion in a fresh CURRENT source tree.

So when you next update your CURRENT tree ... keep in mind that you will need to
manually apply this part of the zfs-patchset (until somebody is kind
enough to provide
an updated patchset).

-- 
  Pascal Hofstee