diff options
| author | Mark Shellenbaum <Mark.Shellenbaum@Sun.COM> | 2010-03-31 15:46:12 -0600 |
|---|---|---|
| committer | Mark Shellenbaum <Mark.Shellenbaum@Sun.COM> | 2010-03-31 15:46:12 -0600 |
| commit | 8f2529de2d60d4fff8eb4d86f71b51584342934e (patch) | |
| tree | acb5722e71acdf3114c9fbd32d41eaa3b63bf196 /usr/src/uts/common/fs/zfs/zfs_znode.c | |
| parent | 1e67f0f0096be223aa7f51802953bebd95866ddc (diff) | |
| download | illumos-gate-8f2529de2d60d4fff8eb4d86f71b51584342934e.tar.gz | |
6938757 SMB and NFS referrals not working correctly
6939680 zfs_sa_upgrade can leak slink pointer
6939859 zfs maps first SID incorrectly when no fuid table exists
Diffstat (limited to 'usr/src/uts/common/fs/zfs/zfs_znode.c')
| -rw-r--r-- | usr/src/uts/common/fs/zfs/zfs_znode.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/usr/src/uts/common/fs/zfs/zfs_znode.c b/usr/src/uts/common/fs/zfs/zfs_znode.c index 3f6fe56f35..3cc99c5b8d 100644 --- a/usr/src/uts/common/fs/zfs/zfs_znode.c +++ b/usr/src/uts/common/fs/zfs/zfs_znode.c @@ -19,8 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. */ /* Portions Copyright 2007 Jeremy Teo */ @@ -987,12 +986,12 @@ zfs_mknode(znode_t *dzp, vattr_t *vap, dmu_tx_t *tx, cred_t *cr, (*zpp)->z_sa_hdl = sa_hdl; } - if (vap->va_mask & AT_XVATTR) - zfs_xvattr_set(*zpp, (xvattr_t *)vap, tx); - (*zpp)->z_pflags = pflags; (*zpp)->z_mode = mode; + if (vap->va_mask & AT_XVATTR) + zfs_xvattr_set(*zpp, (xvattr_t *)vap, tx); + if (obj_type == DMU_OT_ZNODE || acl_ids->z_aclp->z_version < ZFS_ACL_VERSION_FUID) { err = zfs_aclset_common(*zpp, acl_ids->z_aclp, cr, tx); |