[src/trunk]: src/external/cddl/osnet make this compile again. VOP_CLOSE is re...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ddaeb5166de7
branches:  trunk
changeset: 771463:ddaeb5166de7
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Nov 21 17:51:03 2011 +0000

description:
make this compile again. VOP_CLOSE is really vn_close() through macros.

diffstat:

 external/cddl/osnet/dist/uts/common/fs/zfs/spa_config.c |  2 +-
 external/cddl/osnet/sys/sys/zfs_context.h               |  4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r dae449aea757 -r ddaeb5166de7 external/cddl/osnet/dist/uts/common/fs/zfs/spa_config.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/spa_config.c   Mon Nov 21 16:17:48 2011 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/spa_config.c   Mon Nov 21 17:51:03 2011 +0000
@@ -179,7 +179,7 @@
                    VOP_FSYNC(vp, FSYNC, kcred, NULL) == 0) {
                        (void) vn_rename(temp, dp->scd_path, UIO_SYSSPACE);
                }
-               vn_close(vp, FWRITE, kcred);
+               (void) VOP_CLOSE(vp, oflags, 1, 0, kcred, NULL);
        }
 
        (void) vn_remove(temp, UIO_SYSSPACE, RMFILE);
diff -r dae449aea757 -r ddaeb5166de7 external/cddl/osnet/sys/sys/zfs_context.h
--- a/external/cddl/osnet/sys/sys/zfs_context.h Mon Nov 21 16:17:48 2011 +0000
+++ b/external/cddl/osnet/sys/sys/zfs_context.h Mon Nov 21 17:51:03 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: zfs_context.h,v 1.11 2011/11/21 05:50:11 christos Exp $        */
+/*     $NetBSD: zfs_context.h,v 1.12 2011/11/21 17:51:03 christos Exp $        */
 
 /*
  * CDDL HEADER START
@@ -380,7 +380,7 @@
     int x2, int x3, vnode_t *vp, int unk);
 extern int vn_rdwr(int uio, vnode_t *vp, void *addr, ssize_t len,
     offset_t offset, int x1, int x2, rlim64_t x3, void *x4, ssize_t *residp);
-extern void vn_close(vnode_t *vp, int flags, kauth_cred_t cred);
+extern void vn_close(vnode_t *vp);
 extern int vn_getattr(vnode_t *vp, vattr_t *va);
 
 #define        vn_remove(path, x1, x2)         remove(path)