Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/cddl/osnet/dist/uts/common/fs/zfs Replace VATTR_NUL...



details:   https://anonhg.NetBSD.org/src/rev/d3fb6bea6686
branches:  trunk
changeset: 750703:d3fb6bea6686
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Jan 11 12:10:18 2010 +0000

description:
Replace VATTR_NULL() with vattr_null(). The ZFS module can be loaded
again now.

diffstat:

 external/cddl/osnet/dist/uts/common/fs/zfs/zfs_replay.c |  2 +-
 external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c  |  2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r e5b090d2c331 -r d3fb6bea6686 external/cddl/osnet/dist/uts/common/fs/zfs/zfs_replay.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_replay.c   Mon Jan 11 09:49:19 2010 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_replay.c   Mon Jan 11 12:10:18 2010 +0000
@@ -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);
diff -r e5b090d2c331 -r d3fb6bea6686 external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c    Mon Jan 11 09:49:19 2010 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c    Mon Jan 11 12:10:18 2010 +0000
@@ -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;



Home | Main Index | Thread Index | Old Index