Module Name: src
Committed By: tron
Date: Mon Jan 11 12:10:19 UTC 2010
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_replay.c
zfs_znode.c
Log Message:
Replace VATTR_NULL() with vattr_null(). The ZFS module can be loaded
again now.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_replay.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c
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/zfs_replay.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_replay.c:1.3 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_replay.c:1.4
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_replay.c:1.3 Sun Jan 10 01:35:39 2010
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_replay.c Mon Jan 11 12:10:18 2010
@@ -58,7 +58,7 @@
zfs_init_vattr(vattr_t *vap, uint64_t mask, uint64_t mode,
uint64_t uid, uint64_t gid, uint64_t rdev, uint64_t nodeid)
{
- VATTR_NULL(vap);
+ vattr_null(vap);
vap->va_mask = (uint_t)mask;
if (mask & AT_TYPE)
vap->va_type = IFTOVT(mode);
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c:1.4 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c:1.5
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c:1.4 Thu Oct 29 10:26:17 2009
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c Mon Jan 11 12:10:18 2010
@@ -1526,7 +1526,7 @@
* Create root znode. Create minimal znode/vnode/zfsvfs
* to allow zfs_mknode to work.
*/
- VATTR_NULL(&vattr);
+ vattr_null(&vattr);
vattr.va_mask = AT_MODE|AT_UID|AT_GID|AT_TYPE;
vattr.va_type = VDIR;
vattr.va_mode = S_IFDIR|0755;
