Module Name: src
Committed By: christos
Date: Mon Nov 21 17:51:04 UTC 2011
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: spa_config.c
src/external/cddl/osnet/sys/sys: zfs_context.h
Log Message:
make this compile again. VOP_CLOSE is really vn_close() through macros.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_config.c
cvs rdiff -u -r1.11 -r1.12 src/external/cddl/osnet/sys/sys/zfs_context.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_config.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_config.c:1.5 src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_config.c:1.6
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_config.c:1.5 Sun Nov 20 19:24:24 2011
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_config.c Mon Nov 21 12:51:03 2011
@@ -179,7 +179,7 @@ spa_config_write(spa_config_dirent_t *dp
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);
Index: src/external/cddl/osnet/sys/sys/zfs_context.h
diff -u src/external/cddl/osnet/sys/sys/zfs_context.h:1.11 src/external/cddl/osnet/sys/sys/zfs_context.h:1.12
--- src/external/cddl/osnet/sys/sys/zfs_context.h:1.11 Mon Nov 21 00:50:11 2011
+++ src/external/cddl/osnet/sys/sys/zfs_context.h Mon Nov 21 12:51:03 2011
@@ -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 @@ extern int vn_openat(char *path, int x1,
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)
