Deleted Added
full compact
zfs_replay.c (185029) zfs_replay.c (199157)
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

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

55 */
56
57static void
58zfs_init_vattr(vattr_t *vap, uint64_t mask, uint64_t mode,
59 uint64_t uid, uint64_t gid, uint64_t rdev, uint64_t nodeid)
60{
61 VATTR_NULL(vap);
62 vap->va_mask = (uint_t)mask;
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

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

55 */
56
57static void
58zfs_init_vattr(vattr_t *vap, uint64_t mask, uint64_t mode,
59 uint64_t uid, uint64_t gid, uint64_t rdev, uint64_t nodeid)
60{
61 VATTR_NULL(vap);
62 vap->va_mask = (uint_t)mask;
63 vap->va_type = IFTOVT(mode);
64 vap->va_mode = mode & MODEMASK;
65 vap->va_uid = (uid_t)(IS_EPHEMERAL(uid)) ? -1 : uid;
66 vap->va_gid = (gid_t)(IS_EPHEMERAL(gid)) ? -1 : gid;
63 if (mask & AT_TYPE)
64 vap->va_type = IFTOVT(mode);
65 if (mask & AT_MODE)
66 vap->va_mode = mode & MODEMASK;
67 if (mask & AT_UID)
68 vap->va_uid = (uid_t)(IS_EPHEMERAL(uid)) ? -1 : uid;
69 if (mask & AT_GID)
70 vap->va_gid = (gid_t)(IS_EPHEMERAL(gid)) ? -1 : gid;
67 vap->va_rdev = zfs_cmpldev(rdev);
68 vap->va_nodeid = nodeid;
69}
70
71/* ARGSUSED */
72static int
73zfs_replay_error(zfsvfs_t *zfsvfs, lr_t *lr, boolean_t byteswap)
74{

--- 869 unchanged lines hidden ---
71 vap->va_rdev = zfs_cmpldev(rdev);
72 vap->va_nodeid = nodeid;
73}
74
75/* ARGSUSED */
76static int
77zfs_replay_error(zfsvfs_t *zfsvfs, lr_t *lr, boolean_t byteswap)
78{

--- 869 unchanged lines hidden ---