Re: ZFS patches.

On Sun, Jul 27, 2008 at 2:54 PM, Pawel Jakub Dawidek <pjd_at_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