Build still broken (port amd64) - redefinition of vn_close()

[Paul Goyette <paul%whooppee.com@localhost>]

Sources updates minutes ago...

#   compile  libzpool/kernel.pico
/build/netbsd-local/tools/x86_64/amd64/bin/x86_64--netbsd-gcc -g -O0 -fno-inline -std=gnu99      
--sysroot=/build/netbsd-local/dest/amd64 "-D__va_list=va_list" "-Doffsetof(s, 
m)=((size_t)(&(((s *)0)->m)))" -std=c99 -D_SUNOS_VTOC_16 -D_PROPLIB_ZFS_CONFLICT 
-I/build/netbsd-local/src/external/cddl/osnet -I/build/netbsd-local/src/external/cddl/osnet/include 
-I/build/netbsd-local/src/external/cddl/osnet/sys 
-I/build/netbsd-local/src/external/cddl/osnet/dist/uts/common 
-I/build/netbsd-local/src/external/cddl/osnet/dist/uts/common/zfs 
-I/build/netbsd-local/src/external/cddl/osnet/dist/uts/common/fs/zfs 
-I/build/netbsd-local/src/external/cddl/osnet/dist/uts/common/sys 
-I/build/netbsd-local/src/external/cddl/osnet/dist/common/zfs 
-I/build/netbsd-local/src/external/cddl/osnet/dist/head 
-I/build/netbsd-local/src/external/cddl/osnet/dist/lib/libdevinfo 
-I/build/netbsd-local/src/external/cddl/osnet/dist/lib/libnvpair 
-I/build/netbsd-local/src/external/cddl/osnet/dist/lib/libshare/common 
-I/build/netbsd-local/src/external/cddl/osnet/dist/lib/libumem 
-I/build/netbsd-local/src/external/cddl/osnet/dist/lib/libuutil/common 
-I/build/netbsd-local/src/external/cddl/osnet/dist/lib/libzfs/common 
-I/build/netbsd-local/src/external/cddl/osnet/dist/lib/libzpool/common 
-I/build/netbsd-local/src/external/cddl/osnet/dist/common -std=c99  -c    -fPIC -DPIC 
/build/netbsd-local/src/external/cddl/osnet/lib/libzpool/kernel.c -o kernel.pico
/build/netbsd-local/src/external/cddl/osnet/lib/libzpool/kernel.c:264:1: error: 
conflicting types for 'vn_close'
/build/netbsd-local/src/external/cddl/osnet/sys/sys/zfs_context.h:383:13: note: 
previous declaration of 'vn_close' was here
*** [kernel.pico] Error code 1
nbmake: stopped in /build/netbsd-local/src/external/cddl/osnet/lib/libzpool
1 error

-------------------------------------------------------------------------
| Paul Goyette     | PGP Key fingerprint:     | E-mail addresses:       |
| Customer Service | FA29 0E3B 35AF E8AE 6651 | paul at whooppee.com    |
| Network Engineer | 0786 F758 55DE 53BA 7731 | pgoyette at juniper.net |
| Kernel Developer |                          | pgoyette at netbsd.org  |
-------------------------------------------------------------------------