Date: Wed, 20 Aug 2008 18:19:28 +0200 From: "Pascal Hofstee" <caelian@gmail.com> To: "Pawel Jakub Dawidek" <pjd@freebsd.org> Cc: freebsd-fs@freebsd.org, freebsd-current@freebsd.org Subject: Re: ZFS patches. Message-ID: <d8a0b7620808200919o635a8ea4k5c47be2894a89cc8@mail.gmail.com> In-Reply-To: <20080727125413.GG1345@garage.freebsd.pl> References: <20080727125413.GG1345@garage.freebsd.pl>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?d8a0b7620808200919o635a8ea4k5c47be2894a89cc8>