Deleted Added
full compact
zfs_vnops.c (182824) zfs_vnops.c (182905)
1/*
2 * CDDL HEADER START
3 *
4 * The contents of this file are subject to the terms of the
5 * Common Development and Distribution License (the "License").
6 * You may not use this file except in compliance with the License.
7 *
8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE

--- 1177 unchanged lines hidden (view full) ---

1186 int error;
1187 uint64_t zoid;
1188
1189 ZFS_ENTER(zfsvfs);
1190
1191top:
1192 *vpp = NULL;
1193
1/*
2 * CDDL HEADER START
3 *
4 * The contents of this file are subject to the terms of the
5 * Common Development and Distribution License (the "License").
6 * You may not use this file except in compliance with the License.
7 *
8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE

--- 1177 unchanged lines hidden (view full) ---

1186 int error;
1187 uint64_t zoid;
1188
1189 ZFS_ENTER(zfsvfs);
1190
1191top:
1192 *vpp = NULL;
1193
1194 if ((vap->va_mode & VSVTX) && secpolicy_vnode_stky_modify(cr))
1195 vap->va_mode &= ~VSVTX;
1194 if ((vap->va_mode & S_ISVTX) && secpolicy_vnode_stky_modify(cr))
1195 vap->va_mode &= ~S_ISVTX;
1196
1197 if (*name == '\0') {
1198 /*
1199 * Null component name refers to the directory itself.
1200 */
1201 VN_HOLD(dvp);
1202 zp = dzp;
1203 dl = NULL;

--- 2370 unchanged lines hidden ---
1196
1197 if (*name == '\0') {
1198 /*
1199 * Null component name refers to the directory itself.
1200 */
1201 VN_HOLD(dvp);
1202 zp = dzp;
1203 dl = NULL;

--- 2370 unchanged lines hidden ---