From 701931ca124014910c15d2c88b8d0878ef18b59f Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Sat, 1 Dec 2018 08:54:32 -0500 Subject: [PATCH] fs: rename AT_* to VATTR_* At the very least AT_UID and AT_GID conflict with newer libelf. --- include/sys/vnode.h | 76 +++++----- kernel/comstar/lu/stmf_sbd/sbd.c | 2 +- kernel/drivers/lofi/lofi.c | 2 +- kernel/fs/bootfs/bootfs_construct.c | 4 +- kernel/fs/dcfs/dc_vnops.c | 2 +- kernel/fs/dev/sdev_ptsops.c | 6 +- kernel/fs/dev/sdev_subr.c | 76 +++++----- kernel/fs/dev/sdev_vfsops.c | 2 +- kernel/fs/dev/sdev_vnops.c | 22 +-- kernel/fs/dev/sdev_vtops.c | 2 +- kernel/fs/dev/sdev_zvolops.c | 2 +- kernel/fs/devfs/devfs_subr.c | 6 +- kernel/fs/devfs/devfs_vfsops.c | 2 +- kernel/fs/devfs/devfs_vnops.c | 52 +++---- kernel/fs/fifofs/fifosubr.c | 2 +- kernel/fs/fifofs/fifovnops.c | 10 +- kernel/fs/fs_subr.c | 2 +- kernel/fs/gfs.c | 2 +- kernel/fs/hsfs/hsfs_vfsops.c | 4 +- kernel/fs/lofs/lofs_vnops.c | 4 +- kernel/fs/lookup.c | 4 +- kernel/fs/mntfs/mntvnops.c | 36 ++--- kernel/fs/namefs/namevfs.c | 4 +- kernel/fs/namefs/namevno.c | 14 +- kernel/fs/nbmlock.c | 2 +- kernel/fs/nfs/nfs3_srv.c | 154 ++++++++++----------- kernel/fs/nfs/nfs3_vfsops.c | 4 +- kernel/fs/nfs/nfs3_vnops.c | 96 ++++++------- kernel/fs/nfs/nfs3_xdr.c | 2 +- kernel/fs/nfs/nfs4_attr.c | 112 +++++++-------- kernel/fs/nfs/nfs4_client.c | 4 +- kernel/fs/nfs/nfs4_client_state.c | 4 +- kernel/fs/nfs/nfs4_deleg_ops.c | 4 +- kernel/fs/nfs/nfs4_rnode.c | 2 +- kernel/fs/nfs/nfs4_srv.c | 138 +++++++++--------- kernel/fs/nfs/nfs4_srv_attr.c | 106 +++++++------- kernel/fs/nfs/nfs4_srv_ns.c | 4 +- kernel/fs/nfs/nfs4_srv_readdir.c | 2 +- kernel/fs/nfs/nfs4_state.c | 2 +- kernel/fs/nfs/nfs4_vfsops.c | 2 +- kernel/fs/nfs/nfs4_vnops.c | 106 +++++++------- kernel/fs/nfs/nfs4_xdr.c | 64 ++++----- kernel/fs/nfs/nfs_acl_srv.c | 22 +-- kernel/fs/nfs/nfs_acl_vnops.c | 2 +- kernel/fs/nfs/nfs_client.c | 8 +- kernel/fs/nfs/nfs_log.c | 4 +- kernel/fs/nfs/nfs_srv.c | 74 +++++----- kernel/fs/nfs/nfs_subr.c | 28 ++-- kernel/fs/nfs/nfs_vfsops.c | 4 +- kernel/fs/nfs/nfs_vnops.c | 76 +++++----- kernel/fs/pcfs/pc_dir.c | 2 +- kernel/fs/pcfs/pc_vnops.c | 16 +-- kernel/fs/portfs/port_fop.c | 16 +-- kernel/fs/proc/prsubr.c | 14 +- kernel/fs/proc/prvnops.c | 16 +-- kernel/fs/sockfs/sockcommon_vnops.c | 4 +- kernel/fs/sockfs/socksyscalls.c | 6 +- kernel/fs/sockfs/socktpi.c | 2 +- kernel/fs/specfs/specsubr.c | 2 +- kernel/fs/specfs/specvnops.c | 16 +-- kernel/fs/tmpfs/tmp_dir.c | 10 +- kernel/fs/tmpfs/tmp_vfsops.c | 2 +- kernel/fs/tmpfs/tmp_vnops.c | 20 +-- kernel/fs/udfs/udf_alloc.c | 10 +- kernel/fs/udfs/udf_dir.c | 6 +- kernel/fs/udfs/udf_vnops.c | 24 ++-- kernel/fs/ufs/ufs_acl.c | 8 +- kernel/fs/ufs/ufs_dir.c | 16 +-- kernel/fs/ufs/ufs_vnops.c | 34 ++--- kernel/fs/vnode.c | 48 +++---- kernel/fs/xattr.c | 12 +- kernel/fs/zfs/sys/zfs_znode.h | 6 +- kernel/fs/zfs/vdev_file.c | 2 +- kernel/fs/zfs/zfs_acl.c | 2 +- kernel/fs/zfs/zfs_dir.c | 2 +- kernel/fs/zfs/zfs_ioctl.c | 2 +- kernel/fs/zfs/zfs_log.c | 14 +- kernel/fs/zfs/zfs_replay.c | 16 +-- kernel/fs/zfs/zfs_vfsops.c | 2 +- kernel/fs/zfs/zfs_vnops.c | 104 +++++++------- kernel/fs/zfs/zfs_znode.c | 18 +-- kernel/os/acct.c | 2 +- kernel/os/core.c | 2 +- kernel/os/dumpsubr.c | 6 +- kernel/os/exacct.c | 2 +- kernel/os/exec.c | 2 +- kernel/os/fio.c | 2 +- kernel/os/flock.c | 4 +- kernel/os/mmapobj.c | 6 +- kernel/os/policy.c | 26 ++-- kernel/os/urw.c | 2 +- kernel/syscall/acctctl.c | 2 +- kernel/syscall/chdir.c | 4 +- kernel/syscall/chmod.c | 2 +- kernel/syscall/chown.c | 4 +- kernel/syscall/fcntl.c | 6 +- kernel/syscall/ioctl.c | 2 +- kernel/syscall/lseek.c | 12 +- kernel/syscall/mkdir.c | 2 +- kernel/syscall/mknod.c | 4 +- kernel/syscall/open.c | 2 +- kernel/syscall/readlink.c | 2 +- kernel/syscall/rw.c | 8 +- kernel/syscall/sendfile.c | 2 +- kernel/syscall/stat.c | 8 +- kernel/syscall/symlink.c | 2 +- kernel/syscall/utime.c | 6 +- kernel/vm/seg_vn.c | 12 +- kernel/vm/vm_as.c | 2 +- kernel/vm/vm_swap.c | 4 +- usr/src/cmd/zdb/zdb_il.c | 12 +- usr/src/lib/libzpool/common/sys/zfs_context.h | 32 ++--- usr/src/stand/lib/fs/nfs/nfs2ops.c | 14 +- usr/src/stand/lib/fs/nfs/nfs3ops.c | 14 +- usr/src/stand/lib/fs/nfs/nfs4ops.c | 14 +- usr/src/stand/lib/fs/nfs/nfsops.c | 4 +- usr/src/uts/common/c2/audit.c | 6 +- usr/src/uts/common/c2/audit_event.c | 2 +- usr/src/uts/common/fs/smbclnt/smbfs/smbfs_acl.c | 4 +- usr/src/uts/common/fs/smbclnt/smbfs/smbfs_client.c | 8 +- usr/src/uts/common/fs/smbclnt/smbfs/smbfs_vnops.c | 58 ++++---- usr/src/uts/common/fs/smbsrv/smb_fem.c | 2 +- usr/src/uts/common/fs/smbsrv/smb_vops.c | 44 +++--- usr/src/uts/common/fs/zut/zut.c | 6 +- usr/src/uts/common/io/sysmsg.c | 2 +- usr/src/uts/common/io/vscan/vscan_svc.c | 16 +-- usr/src/uts/common/klm/nlm_client.c | 2 +- usr/src/uts/common/nfs/nfs.h | 4 +- usr/src/uts/common/nfs/nfs4_attr.h | 70 +++++----- 129 files changed, 1138 insertions(+), 1132 deletions(-) diff --git a/include/sys/vnode.h b/include/sys/vnode.h index 8c4c105376..905d3cd5c1 100644 --- a/include/sys/vnode.h +++ b/include/sys/vnode.h @@ -502,8 +502,8 @@ typedef struct xoptattr { * The fields of the xvattr structure are: * * xva_vattr - The first element of an xvattr is a legacy vattr structure - * which includes the common attributes. If AT_XVATTR is set in the va_mask - * then the entire structure is treated as an xvattr. If AT_XVATTR is not + * which includes the common attributes. If VATTR_XVATTR is set in the va_mask + * then the entire structure is treated as an xvattr. If VATTR_XVATTR is not * set, then only the xva_vattr structure can be used. * * xva_magic - 0x78766174 (hex for "xvat"). Magic number for verification. @@ -581,41 +581,46 @@ typedef vattr_t vattr32_t; /* * Attributes of interest to the caller of setattr or getattr. */ -#define AT_TYPE 0x00001 -#define AT_MODE 0x00002 -#define AT_UID 0x00004 -#define AT_GID 0x00008 -#define AT_FSID 0x00010 -#define AT_NODEID 0x00020 -#define AT_NLINK 0x00040 -#define AT_SIZE 0x00080 -#define AT_ATIME 0x00100 -#define AT_MTIME 0x00200 -#define AT_CTIME 0x00400 -#define AT_RDEV 0x00800 -#define AT_BLKSIZE 0x01000 -#define AT_NBLOCKS 0x02000 +#define VATTR_TYPE 0x00001 +#define VATTR_MODE 0x00002 +#define VATTR_UID 0x00004 +#define VATTR_GID 0x00008 +#define VATTR_FSID 0x00010 +#define VATTR_NODEID 0x00020 +#define VATTR_NLINK 0x00040 +#define VATTR_SIZE 0x00080 +#define VATTR_ATIME 0x00100 +#define VATTR_MTIME 0x00200 +#define VATTR_CTIME 0x00400 +#define VATTR_RDEV 0x00800 +#define VATTR_BLKSIZE 0x01000 +#define VATTR_NBLOCKS 0x02000 /* 0x04000 */ /* unused */ -#define AT_SEQ 0x08000 +#define VATTR_SEQ 0x08000 /* - * If AT_XVATTR is set then there are additional bits to process in + * If VATTR_XVATTR is set then there are additional bits to process in * the xvattr_t's attribute bitmap. If this is not set then the bitmap * MUST be ignored. Note that this bit must be set/cleared explicitly. - * That is, setting AT_ALL will NOT set AT_XVATTR. + * That is, setting VATTR_ALL will NOT set VATTR_XVATTR. */ -#define AT_XVATTR 0x10000 +#define VATTR_XVATTR 0x10000 -#define AT_ALL (AT_TYPE|AT_MODE|AT_UID|AT_GID|AT_FSID|AT_NODEID|\ - AT_NLINK|AT_SIZE|AT_ATIME|AT_MTIME|AT_CTIME|\ - AT_RDEV|AT_BLKSIZE|AT_NBLOCKS|AT_SEQ) +#define VATTR_ALL (VATTR_TYPE | VATTR_MODE | VATTR_UID | VATTR_GID | \ + VATTR_FSID | VATTR_NODEID | VATTR_NLINK | \ + VATTR_SIZE | VATTR_ATIME | VATTR_MTIME | \ + VATTR_CTIME | VATTR_RDEV | VATTR_BLKSIZE | \ + VATTR_NBLOCKS | VATTR_SEQ) -#define AT_STAT (AT_MODE|AT_UID|AT_GID|AT_FSID|AT_NODEID|AT_NLINK|\ - AT_SIZE|AT_ATIME|AT_MTIME|AT_CTIME|AT_RDEV|AT_TYPE) +#define VATTR_STAT (VATTR_MODE | VATTR_UID | VATTR_GID | VATTR_FSID | \ + VATTR_NODEID | VATTR_NLINK | VATTR_SIZE | \ + VATTR_ATIME | VATTR_MTIME | VATTR_CTIME | \ + VATTR_RDEV | VATTR_TYPE) -#define AT_TIMES (AT_ATIME|AT_MTIME|AT_CTIME) +#define VATTR_TIMES (VATTR_ATIME | VATTR_MTIME | VATTR_CTIME) -#define AT_NOSET (AT_NLINK|AT_RDEV|AT_FSID|AT_NODEID|AT_TYPE|\ - AT_BLKSIZE|AT_NBLOCKS|AT_SEQ) +#define VATTR_NOSET (VATTR_NLINK | VATTR_RDEV | VATTR_FSID | \ + VATTR_NODEID | VATTR_TYPE | VATTR_BLKSIZE | \ + VATTR_NBLOCKS | VATTR_SEQ) /* * Attribute bits used in the extensible attribute's (xva's) attribute @@ -702,7 +707,7 @@ typedef vattr_t vattr32_t; * of requested attributes (xva_reqattrmap[]). */ #define XVA_SET_REQ(xvap, attr) \ - ASSERT((xvap)->xva_vattr.va_mask | AT_XVATTR); \ + ASSERT((xvap)->xva_vattr.va_mask | VATTR_XVATTR); \ ASSERT((xvap)->xva_magic == XVA_MAGIC); \ (xvap)->xva_reqattrmap[XVA_INDEX(attr)] |= XVA_ATTRBIT(attr) /* @@ -710,7 +715,7 @@ typedef vattr_t vattr32_t; * of requested attributes (xva_reqattrmap[]). */ #define XVA_CLR_REQ(xvap, attr) \ - ASSERT((xvap)->xva_vattr.va_mask | AT_XVATTR); \ + ASSERT((xvap)->xva_vattr.va_mask | VATTR_XVATTR); \ ASSERT((xvap)->xva_magic == XVA_MAGIC); \ (xvap)->xva_reqattrmap[XVA_INDEX(attr)] &= ~XVA_ATTRBIT(attr) @@ -719,7 +724,7 @@ typedef vattr_t vattr32_t; * of returned attributes (xva_rtnattrmap[]). */ #define XVA_SET_RTN(xvap, attr) \ - ASSERT((xvap)->xva_vattr.va_mask | AT_XVATTR); \ + ASSERT((xvap)->xva_vattr.va_mask | VATTR_XVATTR); \ ASSERT((xvap)->xva_magic == XVA_MAGIC); \ (XVA_RTNATTRMAP(xvap))[XVA_INDEX(attr)] |= XVA_ATTRBIT(attr) @@ -728,7 +733,7 @@ typedef vattr_t vattr32_t; * to see of the corresponding attribute bit is set. If so, returns non-zero. */ #define XVA_ISSET_REQ(xvap, attr) \ - ((((xvap)->xva_vattr.va_mask | AT_XVATTR) && \ + ((((xvap)->xva_vattr.va_mask | VATTR_XVATTR) && \ ((xvap)->xva_magic == XVA_MAGIC) && \ ((xvap)->xva_mapsize > XVA_INDEX(attr))) ? \ ((xvap)->xva_reqattrmap[XVA_INDEX(attr)] & XVA_ATTRBIT(attr)) : 0) @@ -738,7 +743,7 @@ typedef vattr_t vattr32_t; * to see of the corresponding attribute bit is set. If so, returns non-zero. */ #define XVA_ISSET_RTN(xvap, attr) \ - ((((xvap)->xva_vattr.va_mask | AT_XVATTR) && \ + ((((xvap)->xva_vattr.va_mask | VATTR_XVATTR) && \ ((xvap)->xva_magic == XVA_MAGIC) && \ ((xvap)->xva_mapsize > XVA_INDEX(attr))) ? \ ((XVA_RTNATTRMAP(xvap))[XVA_INDEX(attr)] & XVA_ATTRBIT(attr)) : 0) @@ -1257,8 +1262,9 @@ void vsd_free(vnode_t *); /* * Extensible vnode attribute (xva) routines: - * xva_init() initializes an xvattr_t (zero struct, init mapsize, set AT_XATTR) - * xva_getxoptattr() returns a ponter to the xoptattr_t section of xvattr_t + * xva_init() initializes an xvattr_t (zero struct, init mapsize, set + * VATTR_XVATTR) xva_getxoptattr() returns a ponter to the xoptattr_t + * section of xvattr_t */ void xva_init(xvattr_t *); xoptattr_t *xva_getxoptattr(xvattr_t *); /* Get ptr to xoptattr_t */ diff --git a/kernel/comstar/lu/stmf_sbd/sbd.c b/kernel/comstar/lu/stmf_sbd/sbd.c index 3e58a34777..c775687922 100644 --- a/kernel/comstar/lu/stmf_sbd/sbd.c +++ b/kernel/comstar/lu/stmf_sbd/sbd.c @@ -1506,7 +1506,7 @@ sbd_open_data_file(sbd_lu_t *sl, uint32_t *err_ret, int lu_size_valid, return (ret); } odf_over_open: - vattr.va_mask = AT_SIZE; + vattr.va_mask = VATTR_SIZE; if ((ret = fop_getattr(sl->sl_data_vp, &vattr, 0, CRED(), NULL)) != 0) { *err_ret = SBD_RET_DATA_FILE_GETATTR_FAILED; goto odf_close_data_and_exit; diff --git a/kernel/drivers/lofi/lofi.c b/kernel/drivers/lofi/lofi.c index d6f6ff9e7e..a0e1440b23 100644 --- a/kernel/drivers/lofi/lofi.c +++ b/kernel/drivers/lofi/lofi.c @@ -2813,7 +2813,7 @@ lofi_map_file(dev_t dev, struct lofi_ioctl *ulip, int pickminor, goto err; } - vattr.va_mask = AT_SIZE; + vattr.va_mask = VATTR_SIZE; error = fop_getattr(vp, &vattr, 0, credp, NULL); if (error) goto err; diff --git a/kernel/fs/bootfs/bootfs_construct.c b/kernel/fs/bootfs/bootfs_construct.c index 595ada4c6b..dc26f4949a 100644 --- a/kernel/fs/bootfs/bootfs_construct.c +++ b/kernel/fs/bootfs/bootfs_construct.c @@ -30,7 +30,7 @@ kmem_cache_t *bootfs_node_cache; static const vattr_t bootfs_vattr_dir = { - AT_ALL, /* va_mask */ + VATTR_ALL, /* va_mask */ VDIR, /* va_type */ S_IFDIR | 0555, /* va_mode */ 0, /* va_uid */ @@ -49,7 +49,7 @@ static const vattr_t bootfs_vattr_dir = { }; static const vattr_t bootfs_vattr_reg = { - AT_ALL, /* va_mask */ + VATTR_ALL, /* va_mask */ VREG, /* va_type */ S_IFREG | 0555, /* va_mode */ 0, /* va_uid */ diff --git a/kernel/fs/dcfs/dc_vnops.c b/kernel/fs/dcfs/dc_vnops.c index 95f30b06bc..20acdc9dd9 100644 --- a/kernel/fs/dcfs/dc_vnops.c +++ b/kernel/fs/dcfs/dc_vnops.c @@ -401,7 +401,7 @@ dc_frlock(struct vnode *vp, int cmd, struct flock64 *bfp, int flag, /* * If file is being mapped, disallow frlock. */ - vattr.va_mask = AT_MODE; + vattr.va_mask = VATTR_MODE; if (error = fop_getattr(dp->dc_subvp, &vattr, 0, cr, ctp)) return (error); if (dp->dc_mapcnt > 0 && MANDLOCK(vp, vattr.va_mode)) diff --git a/kernel/fs/dev/sdev_ptsops.c b/kernel/fs/dev/sdev_ptsops.c index 6de5fb28b0..e2c8636091 100644 --- a/kernel/fs/dev/sdev_ptsops.c +++ b/kernel/fs/dev/sdev_ptsops.c @@ -50,7 +50,7 @@ #define isdigit(ch) ((ch) >= '0' && (ch) <= '9') static vattr_t devpts_vattr = { - AT_TYPE|AT_MODE|AT_UID|AT_GID, /* va_mask */ + VATTR_TYPE|VATTR_MODE|VATTR_UID|VATTR_GID,/* va_mask */ VCHR, /* va_type */ S_IFCHR | DEVPTS_DEVMODE_DEFAULT, /* va_mode */ DEVPTS_UID_DEFAULT, /* va_uid */ @@ -381,7 +381,7 @@ devpts_readdir(struct vnode *dvp, struct uio *uiop, struct cred *cred, static int devpts_set_id(struct sdev_node *dv, struct vattr *vap, int protocol) { - ASSERT((protocol & AT_UID) || (protocol & AT_GID)); + ASSERT((protocol & VATTR_UID) || (protocol & VATTR_GID)); ptms_set_owner(getminor(SDEVTOV(dv)->v_rdev), vap->va_uid, vap->va_gid); return (0); @@ -395,7 +395,7 @@ devpts_setattr(struct vnode *vp, struct vattr *vap, int flags, { ASSERT((vp->v_type == VCHR) || (vp->v_type == VDIR)); return (devname_setattr_func(vp, vap, flags, cred, - devpts_set_id, AT_UID|AT_GID)); + devpts_set_id, VATTR_UID|VATTR_GID)); } diff --git a/kernel/fs/dev/sdev_subr.c b/kernel/fs/dev/sdev_subr.c index abd094133d..14efc0436d 100644 --- a/kernel/fs/dev/sdev_subr.c +++ b/kernel/fs/dev/sdev_subr.c @@ -73,7 +73,7 @@ int sdev_debug_cache_flags = 0; */ /* prototype memory vattrs */ vattr_t sdev_vattr_dir = { - AT_TYPE|AT_MODE|AT_UID|AT_GID, /* va_mask */ + VATTR_TYPE|VATTR_MODE|VATTR_UID|VATTR_GID,/* va_mask */ VDIR, /* va_type */ SDEV_DIRMODE_DEFAULT, /* va_mode */ SDEV_UID_DEFAULT, /* va_uid */ @@ -92,7 +92,7 @@ vattr_t sdev_vattr_dir = { }; vattr_t sdev_vattr_lnk = { - AT_TYPE|AT_MODE, /* va_mask */ + VATTR_TYPE|VATTR_MODE, /* va_mask */ VLNK, /* va_type */ SDEV_LNKMODE_DEFAULT, /* va_mode */ SDEV_UID_DEFAULT, /* va_uid */ @@ -111,7 +111,7 @@ vattr_t sdev_vattr_lnk = { }; vattr_t sdev_vattr_blk = { - AT_TYPE|AT_MODE|AT_UID|AT_GID, /* va_mask */ + VATTR_TYPE|VATTR_MODE|VATTR_UID|VATTR_GID,/* va_mask */ VBLK, /* va_type */ S_IFBLK | SDEV_DEVMODE_DEFAULT, /* va_mode */ SDEV_UID_DEFAULT, /* va_uid */ @@ -130,7 +130,7 @@ vattr_t sdev_vattr_blk = { }; vattr_t sdev_vattr_chr = { - AT_TYPE|AT_MODE|AT_UID|AT_GID, /* va_mask */ + VATTR_TYPE|VATTR_MODE|VATTR_UID|VATTR_GID,/* va_mask */ VCHR, /* va_type */ S_IFCHR | SDEV_DEVMODE_DEFAULT, /* va_mode */ SDEV_UID_DEFAULT, /* va_uid */ @@ -256,29 +256,29 @@ sdev_attr_update(struct sdev_node *dv, vattr_t *vap) attrp = dv->sdev_attr; mask = vap->va_mask; - if (mask & AT_TYPE) + if (mask & VATTR_TYPE) attrp->va_type = vap->va_type; - if (mask & AT_MODE) + if (mask & VATTR_MODE) attrp->va_mode = vap->va_mode; - if (mask & AT_UID) + if (mask & VATTR_UID) attrp->va_uid = vap->va_uid; - if (mask & AT_GID) + if (mask & VATTR_GID) attrp->va_gid = vap->va_gid; - if (mask & AT_RDEV) + if (mask & VATTR_RDEV) attrp->va_rdev = vap->va_rdev; gethrestime(&now); - attrp->va_atime = (mask & AT_ATIME) ? vap->va_atime : now; - attrp->va_mtime = (mask & AT_MTIME) ? vap->va_mtime : now; - attrp->va_ctime = (mask & AT_CTIME) ? vap->va_ctime : now; + attrp->va_atime = (mask & VATTR_ATIME) ? vap->va_atime : now; + attrp->va_mtime = (mask & VATTR_MTIME) ? vap->va_mtime : now; + attrp->va_ctime = (mask & VATTR_CTIME) ? vap->va_ctime : now; } static void sdev_attr_alloc(struct sdev_node *dv, vattr_t *vap) { ASSERT(dv->sdev_attr == NULL); - ASSERT(vap->va_mask & AT_TYPE); - ASSERT(vap->va_mask & AT_MODE); + ASSERT(vap->va_mask & VATTR_TYPE); + ASSERT(vap->va_mask & VATTR_MODE); dv->sdev_attr = kmem_zalloc(sizeof (struct vattr), KM_SLEEP); sdev_attr_update(dv, vap); @@ -863,14 +863,14 @@ sdev_update_timestamps(struct vnode *vp, cred_t *cred, uint_t mask) ASSERT(vp); gethrestime(&now); - if (mask & AT_CTIME) + if (mask & VATTR_CTIME) attr.va_ctime = now; - if (mask & AT_MTIME) + if (mask & VATTR_MTIME) attr.va_mtime = now; - if (mask & AT_ATIME) + if (mask & VATTR_ATIME) attr.va_atime = now; - attr.va_mask = (mask & AT_TIMES); + attr.va_mask = (mask & VATTR_TIMES); err = fop_setattr(vp, &attr, 0, cred, NULL); if (err && (err != EROFS)) { sdcmn_err(("update timestamps error %d\n", err)); @@ -1098,7 +1098,7 @@ sdev_rnmnode(struct sdev_node *oddv, struct sdev_node *odv, struct sdev_node *ndv = NULL; timestruc_t now; - vattr.va_mask = AT_TYPE|AT_MODE|AT_UID|AT_GID; + vattr.va_mask = VATTR_TYPE|VATTR_MODE|VATTR_UID|VATTR_GID; error = fop_getattr(ovp, &vattr, 0, cred, NULL); if (error) return (error); @@ -1270,7 +1270,7 @@ sdev_rnmnode(struct sdev_node *oddv, struct sdev_node *odv, if ((*ndvp)->sdev_attrvp) { sdev_update_timestamps((*ndvp)->sdev_attrvp, kcred, - AT_CTIME|AT_ATIME); + VATTR_CTIME|VATTR_ATIME); } else { ASSERT((*ndvp)->sdev_attr); gethrestime(&now); @@ -1280,7 +1280,7 @@ sdev_rnmnode(struct sdev_node *oddv, struct sdev_node *odv, if (nddv->sdev_attrvp) { sdev_update_timestamps(nddv->sdev_attrvp, kcred, - AT_MTIME|AT_ATIME); + VATTR_MTIME|VATTR_ATIME); } else { ASSERT(nddv->sdev_attr); gethrestime(&now); @@ -1468,7 +1468,7 @@ sdev_filldir_from_store(struct sdev_node *ddv, int dlen, struct cred *cred) if (error) continue; - vattr.va_mask = AT_TYPE|AT_MODE|AT_UID|AT_GID; + vattr.va_mask = VATTR_TYPE|VATTR_MODE|VATTR_UID|VATTR_GID; error = fop_getattr(vp, &vattr, 0, cred, NULL); if (error) continue; @@ -1596,7 +1596,7 @@ lookup: gethrestime(&vap->va_atime); vap->va_mtime = vap->va_atime; vap->va_ctime = vap->va_atime; - vap->va_mask |= AT_TYPE|AT_MODE; + vap->va_mask |= VATTR_TYPE|VATTR_MODE; switch (vap->va_type) { case VDIR: error = fop_mkdir(rdvp, nm, vap, rvp, cred, NULL, 0, NULL); @@ -1966,7 +1966,7 @@ tryagain: if (!error) { - vattr.va_mask = AT_TYPE|AT_MODE|AT_UID|AT_GID; + vattr.va_mask = VATTR_TYPE|VATTR_MODE|VATTR_UID|VATTR_GID; error = fop_getattr(rvp, &vattr, 0, cred, NULL); if (error) { rw_exit(&ddv->sdev_contents); @@ -2618,7 +2618,7 @@ full: gethrestime(&now); attr.va_ctime = now; attr.va_atime = now; - attr.va_mask = AT_CTIME|AT_ATIME; + attr.va_mask = VATTR_CTIME|VATTR_ATIME; (void) fop_setattr(ddv->sdev_attrvp, &attr, 0, kcred, NULL); } @@ -2917,8 +2917,8 @@ sdev_modctl_devexists(const char *path) /* * a generic setattr() function * - * note: flags only supports AT_UID and AT_GID. - * Future enhancements can be done for other types, e.g. AT_MODE + * note: flags only supports VATTR_UID and VATTR_GID. + * Future enhancements can be done for other types, e.g. VATTR_MODE */ int devname_setattr_func(struct vnode *vp, struct vattr *vap, int flags, @@ -2932,10 +2932,10 @@ devname_setattr_func(struct vnode *vp, struct vattr *vap, int flags, int error; /* some sanity checks */ - if (vap->va_mask & AT_NOSET) + if (vap->va_mask & VATTR_NOSET) return (EINVAL); - if (vap->va_mask & AT_SIZE) { + if (vap->va_mask & VATTR_SIZE) { if (vp->v_type == VDIR) { return (EISDIR); } @@ -2960,7 +2960,7 @@ devname_setattr_func(struct vnode *vp, struct vattr *vap, int flags, */ ASSERT(dv->sdev_attr); if (SDEV_IS_PERSIST(dv) || - ((vap->va_mask & ~AT_TIMES) != 0 && !SDEV_IS_DYNAMIC(dv))) { + ((vap->va_mask & ~VATTR_TIMES) != 0 && !SDEV_IS_DYNAMIC(dv))) { sdev_vattr_merge(dv, vap); rw_enter(&dv->sdev_contents, RW_WRITER); error = sdev_shadow_node(dv, cred); @@ -2986,20 +2986,20 @@ devname_setattr_func(struct vnode *vp, struct vattr *vap, int flags, } get = dv->sdev_attr; - if (mask & AT_MODE) { + if (mask & VATTR_MODE) { get->va_mode &= S_IFMT; get->va_mode |= vap->va_mode & ~S_IFMT; } - if ((mask & AT_UID) || (mask & AT_GID)) { - if (mask & AT_UID) + if ((mask & VATTR_UID) || (mask & VATTR_GID)) { + if (mask & VATTR_UID) get->va_uid = vap->va_uid; - if (mask & AT_GID) + if (mask & VATTR_GID) get->va_gid = vap->va_gid; /* * a callback must be provided if the protocol is set */ - if ((protocol & AT_UID) || (protocol & AT_GID)) { + if ((protocol & VATTR_UID) || (protocol & VATTR_GID)) { ASSERT(callback); error = callback(dv, get, protocol); if (error) { @@ -3010,11 +3010,11 @@ devname_setattr_func(struct vnode *vp, struct vattr *vap, int flags, } } - if (mask & AT_ATIME) + if (mask & VATTR_ATIME) get->va_atime = vap->va_atime; - if (mask & AT_MTIME) + if (mask & VATTR_MTIME) get->va_mtime = vap->va_mtime; - if (mask & (AT_MODE | AT_UID | AT_GID | AT_CTIME)) { + if (mask & (VATTR_MODE | VATTR_UID | VATTR_GID | VATTR_CTIME)) { gethrestime(&get->va_ctime); } diff --git a/kernel/fs/dev/sdev_vfsops.c b/kernel/fs/dev/sdev_vfsops.c index b8b990edff..10ae899a62 100644 --- a/kernel/fs/dev/sdev_vfsops.c +++ b/kernel/fs/dev/sdev_vfsops.c @@ -349,7 +349,7 @@ sdev_mount(struct vfs *vfsp, struct vnode *mvp, struct mounta *uap, } sdev_update_timestamps(dv->sdev_attrvp, - cr, AT_CTIME|AT_MTIME|AT_ATIME); + cr, VATTR_CTIME|VATTR_MTIME|VATTR_ATIME); cleanup: if (args) diff --git a/kernel/fs/dev/sdev_vnops.c b/kernel/fs/dev/sdev_vnops.c index eb394976a6..5692a1c8fb 100644 --- a/kernel/fs/dev/sdev_vnops.c +++ b/kernel/fs/dev/sdev_vnops.c @@ -422,7 +422,7 @@ sdev_write(struct vnode *vp, struct uio *uio, int ioflag, struct cred *cred, fop_rwunlock(dv->sdev_attrvp, 1, ct); if (error == 0) { sdev_update_timestamps(dv->sdev_attrvp, kcred, - AT_MTIME); + VATTR_MTIME); } return (error); } @@ -721,7 +721,7 @@ sdev_create(struct vnode *dvp, char *nm, struct vattr *vap, vcexcl_t excl, } /* truncation first */ - if ((vp->v_type == VREG) && (vap->va_mask & AT_SIZE) && + if ((vp->v_type == VREG) && (vap->va_mask & VATTR_SIZE) && (vap->va_size == 0)) { ASSERT(parent->sdev_attrvp); error = fop_create(parent->sdev_attrvp, @@ -734,7 +734,7 @@ sdev_create(struct vnode *dvp, char *nm, struct vattr *vap, vcexcl_t excl, } sdev_update_timestamps(vp, kcred, - AT_CTIME|AT_MTIME|AT_ATIME); + VATTR_CTIME|VATTR_MTIME|VATTR_ATIME); *vpp = vp; return (0); } @@ -774,8 +774,8 @@ sdev_create(struct vnode *dvp, char *nm, struct vattr *vap, vcexcl_t excl, ASSERT(self); /* take care the timestamps for the node and its parent */ sdev_update_timestamps(SDEVTOV(self), kcred, - AT_CTIME|AT_MTIME|AT_ATIME); - sdev_update_timestamps(dvp, kcred, AT_MTIME|AT_ATIME); + VATTR_CTIME|VATTR_MTIME|VATTR_ATIME); + sdev_update_timestamps(dvp, kcred, VATTR_MTIME|VATTR_ATIME); if (SDEV_IS_GLOBAL(parent)) atomic_inc_ulong(&parent->sdev_gdir_gen); @@ -995,7 +995,7 @@ sdev_rename(struct vnode *odvp, char *onm, struct vnode *ndvp, char *nnm, * in the same dev filesystem */ if (odvp != ndvp) { - vattr.va_mask = AT_FSID; + vattr.va_mask = VATTR_FSID; if (error = fop_getattr(odvp, &vattr, 0, cred, ct)) { mutex_exit(&sdev_lock); VN_RELE(ovp); @@ -1004,7 +1004,7 @@ sdev_rename(struct vnode *odvp, char *onm, struct vnode *ndvp, char *nnm, return (error); } fsid = vattr.va_fsid; - vattr.va_mask = AT_FSID; + vattr.va_mask = VATTR_FSID; if (error = fop_getattr(ndvp, &vattr, 0, cred, ct)) { mutex_exit(&sdev_lock); VN_RELE(ovp); @@ -1212,8 +1212,8 @@ sdev_symlink(struct vnode *dvp, char *lnm, struct vattr *tva, /* take care the timestamps for the node and its parent */ sdev_update_timestamps(SDEVTOV(self), kcred, - AT_CTIME|AT_MTIME|AT_ATIME); - sdev_update_timestamps(dvp, kcred, AT_MTIME|AT_ATIME); + VATTR_CTIME|VATTR_MTIME|VATTR_ATIME); + sdev_update_timestamps(dvp, kcred, VATTR_MTIME|VATTR_ATIME); if (SDEV_IS_GLOBAL(parent)) atomic_inc_ulong(&parent->sdev_gdir_gen); @@ -1284,8 +1284,8 @@ sdev_mkdir(struct vnode *dvp, char *nm, struct vattr *va, struct vnode **vpp, /* take care the timestamps for the node and its parent */ sdev_update_timestamps(SDEVTOV(self), kcred, - AT_CTIME|AT_MTIME|AT_ATIME); - sdev_update_timestamps(dvp, kcred, AT_MTIME|AT_ATIME); + VATTR_CTIME|VATTR_MTIME|VATTR_ATIME); + sdev_update_timestamps(dvp, kcred, VATTR_MTIME|VATTR_ATIME); if (SDEV_IS_GLOBAL(parent)) atomic_inc_ulong(&parent->sdev_gdir_gen); diff --git a/kernel/fs/dev/sdev_vtops.c b/kernel/fs/dev/sdev_vtops.c index 8e23fde285..d493b5748f 100644 --- a/kernel/fs/dev/sdev_vtops.c +++ b/kernel/fs/dev/sdev_vtops.c @@ -51,7 +51,7 @@ /* attributes for VT nodes */ static vattr_t devvt_vattr = { - AT_TYPE|AT_MODE|AT_UID|AT_GID, /* va_mask */ + VATTR_TYPE|VATTR_MODE|VATTR_UID|VATTR_GID,/* va_mask */ VCHR, /* va_type */ S_IFCHR | DEVVT_DEVMODE_DEFAULT, /* va_mode */ DEVVT_UID_DEFAULT, /* va_uid */ diff --git a/kernel/fs/dev/sdev_zvolops.c b/kernel/fs/dev/sdev_zvolops.c index cb9207f0d2..eb671e4a51 100644 --- a/kernel/fs/dev/sdev_zvolops.c +++ b/kernel/fs/dev/sdev_zvolops.c @@ -612,7 +612,7 @@ devzvol_mk_ngz_node(struct sdev_node *parent, char *nm) bzero(&vattr, sizeof (vattr)); gethrestime(&now); - vattr.va_mask = AT_TYPE|AT_MODE|AT_UID|AT_GID; + vattr.va_mask = VATTR_TYPE|VATTR_MODE|VATTR_UID|VATTR_GID; vattr.va_uid = SDEV_UID_DEFAULT; vattr.va_gid = SDEV_GID_DEFAULT; vattr.va_type = VNON; diff --git a/kernel/fs/devfs/devfs_subr.c b/kernel/fs/devfs/devfs_subr.c index dededa399c..0a3b3f1d6f 100644 --- a/kernel/fs/devfs/devfs_subr.c +++ b/kernel/fs/devfs/devfs_subr.c @@ -72,7 +72,7 @@ struct dv_node *dvroot; /* prototype memory vattrs */ vattr_t dv_vattr_dir = { - AT_TYPE|AT_MODE|AT_UID|AT_GID, /* va_mask */ + VATTR_TYPE|VATTR_MODE|VATTR_UID|VATTR_GID,/* va_mask */ VDIR, /* va_type */ DV_DIRMODE_DEFAULT, /* va_mode */ DV_UID_DEFAULT, /* va_uid */ @@ -91,7 +91,7 @@ vattr_t dv_vattr_dir = { }; vattr_t dv_vattr_file = { - AT_TYPE|AT_MODE|AT_SIZE|AT_UID|AT_GID|AT_RDEV, /* va_mask */ + VATTR_TYPE|VATTR_MODE|VATTR_SIZE|VATTR_UID|VATTR_GID|VATTR_RDEV,/* va_mask */ 0, /* va_type */ DV_DEVMODE_DEFAULT, /* va_mode */ DV_UID_DEFAULT, /* va_uid */ @@ -110,7 +110,7 @@ vattr_t dv_vattr_file = { }; vattr_t dv_vattr_priv = { - AT_TYPE|AT_MODE|AT_SIZE|AT_UID|AT_GID|AT_RDEV, /* va_mask */ + VATTR_TYPE|VATTR_MODE|VATTR_SIZE|VATTR_UID|VATTR_GID|VATTR_RDEV,/* va_mask */ 0, /* va_type */ DV_DEVMODE_PRIV, /* va_mode */ DV_UID_DEFAULT, /* va_uid */ diff --git a/kernel/fs/devfs/devfs_vfsops.c b/kernel/fs/devfs/devfs_vfsops.c index 371e1032bb..67135691ee 100644 --- a/kernel/fs/devfs/devfs_vfsops.c +++ b/kernel/fs/devfs/devfs_vfsops.c @@ -219,7 +219,7 @@ devfs_mount(struct vfs *vfsp, struct vnode *mvp, struct mounta *uap, devfs_mntinfo = devfs_data; mutex_exit(&devfs_lock); - va.va_mask = AT_ATIME|AT_MTIME; + va.va_mask = VATTR_ATIME|VATTR_MTIME; gethrestime(&va.va_atime); gethrestime(&va.va_mtime); (void) fop_setattr(DVTOV(dv), &va, 0, cr, NULL); diff --git a/kernel/fs/devfs/devfs_vnops.c b/kernel/fs/devfs/devfs_vnops.c index 6a4f63e4bd..b92f627acb 100644 --- a/kernel/fs/devfs/devfs_vnops.c +++ b/kernel/fs/devfs/devfs_vnops.c @@ -231,7 +231,7 @@ devfs_setattr_dir( ASSERT(vp->v_type == VDIR); ASSERT((dv->dv_flags & DV_NO_FSPERM) == 0); - if (vap->va_mask & AT_NOSET) + if (vap->va_mask & VATTR_NOSET) return (EINVAL); /* to ensure consistency, single thread setting of attributes */ @@ -254,20 +254,20 @@ again: if (dv->dv_attr) { mask = vap->va_mask; /* Change file access modes. */ - if (mask & AT_MODE) { + if (mask & VATTR_MODE) { map->va_mode &= S_IFMT; map->va_mode |= vap->va_mode & ~S_IFMT; } - if (mask & AT_UID) + if (mask & VATTR_UID) map->va_uid = vap->va_uid; - if (mask & AT_GID) + if (mask & VATTR_GID) map->va_gid = vap->va_gid; - if (mask & AT_ATIME) + if (mask & VATTR_ATIME) map->va_atime = vap->va_atime; - if (mask & AT_MTIME) + if (mask & VATTR_MTIME) map->va_mtime = vap->va_mtime; - if (mask & (AT_MODE | AT_UID | AT_GID | AT_MTIME)) + if (mask & (VATTR_MODE | VATTR_UID | VATTR_GID | VATTR_MTIME)) gethrestime(&map->va_ctime); } else { /* use the backing attribute store */ @@ -277,7 +277,7 @@ again: if (dv->dv_attr) { * See if we are changing something we care about * the persistence of - return success if we don't care. */ - if (vap->va_mask & (AT_MODE|AT_UID|AT_GID|AT_ATIME|AT_MTIME)) { + if (vap->va_mask & (VATTR_MODE|VATTR_UID|VATTR_GID|VATTR_ATIME|VATTR_MTIME)) { /* Set the attributes */ error = fop_setattr(dv->dv_attrvp, vap, flags, cr, NULL); @@ -365,7 +365,7 @@ devfs_setattr( return (ENOENT); } - if (vap->va_mask & AT_NOSET) + if (vap->va_mask & VATTR_NOSET) return (EINVAL); /* @@ -373,7 +373,7 @@ devfs_setattr( * the persistence of, return success. */ if ((vap->va_mask & - (AT_MODE|AT_UID|AT_GID|AT_ATIME|AT_MTIME)) == 0) + (VATTR_MODE|VATTR_UID|VATTR_GID|VATTR_ATIME|VATTR_MTIME)) == 0) return (0); /* @@ -382,14 +382,14 @@ devfs_setattr( */ if (dv->dv_flags & DV_NO_FSPERM) { ASSERT(dv->dv_attr); - if (vap->va_mask & (AT_MODE | AT_UID | AT_GID)) + if (vap->va_mask & (VATTR_MODE | VATTR_UID | VATTR_GID)) return (EPERM); - if ((vap->va_mask & (AT_ATIME|AT_MTIME)) == 0) + if ((vap->va_mask & (VATTR_ATIME|VATTR_MTIME)) == 0) return (0); rw_enter(&dv->dv_contents, RW_WRITER); - if (vap->va_mask & AT_ATIME) + if (vap->va_mask & VATTR_ATIME) dv->dv_attr->va_atime = vap->va_atime; - if (vap->va_mask & AT_MTIME) + if (vap->va_mask & VATTR_MTIME) dv->dv_attr->va_mtime = vap->va_mtime; rw_exit(&dv->dv_contents); return (0); @@ -416,7 +416,7 @@ devfs_setattr( * We don't need to create an attribute node * to persist access or modification times. */ - persist = (vap->va_mask & (AT_MODE | AT_UID | AT_GID)); + persist = (vap->va_mask & (VATTR_MODE | VATTR_UID | VATTR_GID)); /* * If persisting something, get the default permissions @@ -483,20 +483,20 @@ devfs_setattr( mask = vap->va_mask; /* Change file access modes. */ - if (mask & AT_MODE) { + if (mask & VATTR_MODE) { map->va_mode &= S_IFMT; map->va_mode |= vap->va_mode & ~S_IFMT; } - if (mask & AT_UID) + if (mask & VATTR_UID) map->va_uid = vap->va_uid; - if (mask & AT_GID) + if (mask & VATTR_GID) map->va_gid = vap->va_gid; - if (mask & AT_ATIME) + if (mask & VATTR_ATIME) map->va_atime = vap->va_atime; - if (mask & AT_MTIME) + if (mask & VATTR_MTIME) map->va_mtime = vap->va_mtime; - if (mask & (AT_MODE | AT_UID | AT_GID | AT_MTIME)) { + if (mask & (VATTR_MODE | VATTR_UID | VATTR_GID | VATTR_MTIME)) { gethrestime(&map->va_ctime); } @@ -526,13 +526,13 @@ devfs_setattr( } ASSERT(dv->dv_attr); } else { - if (mask & AT_MODE) + if (mask & VATTR_MODE) dcmn_err5(("%s persisting mode 0%o\n", dv->dv_name, vap->va_mode)); - if (mask & AT_UID) + if (mask & VATTR_UID) dcmn_err5(("%s persisting uid %d\n", dv->dv_name, vap->va_uid)); - if (mask & AT_GID) + if (mask & VATTR_GID) dcmn_err5(("%s persisting gid %d\n", dv->dv_name, vap->va_gid)); @@ -547,7 +547,7 @@ devfs_setattr( if (dv->dv_attr == map) { mask = map->va_mask; map->va_mask = - vap->va_mask | AT_ATIME | AT_MTIME; + vap->va_mask | VATTR_ATIME | VATTR_MTIME; error = fop_setattr(dv->dv_attrvp, map, flags, cr, NULL); map->va_mask = mask; @@ -1011,7 +1011,7 @@ full: dcmn_err3(("devfs_readdir: moving %lu bytes: " uiop->uio_loffset = diroff; } - va.va_mask = AT_ATIME; + va.va_mask = VATTR_ATIME; gethrestime(&va.va_atime); rw_exit(&ddv->dv_contents); (void) devfs_setattr(dvp, &va, 0, cred, ct); diff --git a/kernel/fs/fifofs/fifosubr.c b/kernel/fs/fifofs/fifosubr.c index 313783e5f8..3b49474567 100644 --- a/kernel/fs/fifofs/fifosubr.c +++ b/kernel/fs/fifofs/fifosubr.c @@ -438,7 +438,7 @@ fifovp(vnode_t *vp, cred_t *crp) /* * initialize the times from vp. */ - va.va_mask = AT_TIMES; + va.va_mask = VATTR_TIMES; if (fop_getattr(vp, &va, 0, crp, NULL) == 0) { fnp->fn_atime = va.va_atime.tv_sec; fnp->fn_mtime = va.va_mtime.tv_sec; diff --git a/kernel/fs/fifofs/fifovnops.c b/kernel/fs/fifofs/fifovnops.c index 005e9be0dc..cc6da464f5 100644 --- a/kernel/fs/fifofs/fifovnops.c +++ b/kernel/fs/fifofs/fifovnops.c @@ -1478,9 +1478,9 @@ fifo_setattr(vnode_t *vp, vattr_t *vap, int flags, cred_t *crp, if (error == 0) { fn_lock = fnp->fn_lock; mutex_enter(&fn_lock->flk_lock); - if (vap->va_mask & AT_ATIME) + if (vap->va_mask & VATTR_ATIME) fnp->fn_atime = vap->va_atime.tv_sec; - if (vap->va_mask & AT_MTIME) + if (vap->va_mask & VATTR_MTIME) fnp->fn_mtime = vap->va_mtime.tv_sec; fnp->fn_ctime = gethrestime_sec(); mutex_exit(&fn_lock->flk_lock); @@ -1537,16 +1537,16 @@ fifo_fsync(vnode_t *vp, int syncflag, cred_t *crp, caller_context_t *ct) return (0); bzero((caddr_t)&va, sizeof (va)); - va.va_mask = AT_MTIME | AT_ATIME; + va.va_mask = VATTR_MTIME | VATTR_ATIME; if (fop_getattr(fnp->fn_realvp, &va, 0, crp, ct) == 0) { va.va_mask = 0; if (fnp->fn_mtime > va.va_mtime.tv_sec) { va.va_mtime.tv_sec = fnp->fn_mtime; - va.va_mask = AT_MTIME; + va.va_mask = VATTR_MTIME; } if (fnp->fn_atime > va.va_atime.tv_sec) { va.va_atime.tv_sec = fnp->fn_atime; - va.va_mask |= AT_ATIME; + va.va_mask |= VATTR_ATIME; } if (va.va_mask != 0) (void) fop_setattr(fnp->fn_realvp, &va, 0, crp, ct); diff --git a/kernel/fs/fs_subr.c b/kernel/fs/fs_subr.c index 9ecf92d1ea..db1c9a4ef5 100644 --- a/kernel/fs/fs_subr.c +++ b/kernel/fs/fs_subr.c @@ -517,7 +517,7 @@ fs_fab_acl(vnode_t *vp, vsecattr_t *vsecattr, int flag, cred_t *cr, vsecattr->vsa_dfaclcnt = 0; /* Default ACLs are not fabricated */ vsecattr->vsa_dfaclentp = NULL; - vattr.va_mask = AT_MODE | AT_UID | AT_GID; + vattr.va_mask = VATTR_MODE | VATTR_UID | VATTR_GID; if (error = fop_getattr(vp, &vattr, 0, cr, ct)) return (error); diff --git a/kernel/fs/gfs.c b/kernel/fs/gfs.c index 67f5ad36e0..754566ebe5 100644 --- a/kernel/fs/gfs.c +++ b/kernel/fs/gfs.c @@ -139,7 +139,7 @@ gfs_get_parent_ino(vnode_t *dvp, cred_t *cr, caller_context_t *ct, } else if (dvp->v_flag & V_XATTRDIR) { vattr_t va; - va.va_mask = AT_NODEID; + va.va_mask = VATTR_NODEID; error = fop_getattr(parent, &va, 0, cr, ct); if (error) return (error); diff --git a/kernel/fs/hsfs/hsfs_vfsops.c b/kernel/fs/hsfs/hsfs_vfsops.c index 5133099339..f4d1e25ebd 100644 --- a/kernel/fs/hsfs/hsfs_vfsops.c +++ b/kernel/fs/hsfs/hsfs_vfsops.c @@ -624,7 +624,7 @@ hs_mountfs( goto cleanup; } - vap.va_mask = AT_SIZE; + vap.va_mask = VATTR_SIZE; if ((error = fop_getattr(devvp, &vap, ATTR_COMM, cr, NULL)) != 0) { cmn_err(CE_NOTE, "Cannot get attributes of the CD-ROM driver"); goto cleanup; @@ -1370,7 +1370,7 @@ hs_getmdev(struct vfs *vfsp, char *fspec, int flags, dev_t *pdev, mode_t *mode, if ((error = fop_access(svp, VREAD, 0, cr, NULL)) != 0) goto out; - vap.va_mask = AT_MODE; /* get protection mode */ + vap.va_mask = VATTR_MODE; /* get protection mode */ (void) fop_getattr(bvp, &vap, 0, CRED(), NULL); *mode = vap.va_mode; diff --git a/kernel/fs/lofs/lofs_vnops.c b/kernel/fs/lofs/lofs_vnops.c index d27aa0a459..9ea232a7b4 100644 --- a/kernel/fs/lofs/lofs_vnops.c +++ b/kernel/fs/lofs/lofs_vnops.c @@ -717,9 +717,9 @@ lo_create( struct vattr vattr; vattr.va_size = 0; - vattr.va_mask = AT_SIZE; + vattr.va_mask = VATTR_SIZE; - if ((va->va_mask & AT_SIZE) != 0 && va->va_size == 0 && + if ((va->va_mask & VATTR_SIZE) != 0 && va->va_size == 0 && fop_setattr(dvp, &vattr, 0, CRED(), NULL) != 0) return (error); diff --git a/kernel/fs/lookup.c b/kernel/fs/lookup.c index b44dac77f9..17bfc5986e 100644 --- a/kernel/fs/lookup.c +++ b/kernel/fs/lookup.c @@ -779,7 +779,7 @@ vnode_match(vnode_t *v1, vnode_t *v2, cred_t *cr) return (1); } - v1attr.va_mask = v2attr.va_mask = AT_TYPE; + v1attr.va_mask = v2attr.va_mask = VATTR_TYPE; /* * This check for symbolic links handles the pseudo-symlinks in procfs. @@ -793,7 +793,7 @@ vnode_match(vnode_t *v1, vnode_t *v2, cred_t *cr) v1attr.va_type == VLNK || v2attr.va_type == VLNK) return (0); - v1attr.va_mask = v2attr.va_mask = AT_TYPE | AT_FSID | AT_NODEID; + v1attr.va_mask = v2attr.va_mask = VATTR_TYPE | VATTR_FSID | VATTR_NODEID; if (fop_getattr(v1, &v1attr, ATTR_REAL, cr, NULL) != 0 || fop_getattr(v2, &v2attr, ATTR_REAL, cr, NULL) != 0) diff --git a/kernel/fs/mntfs/mntvnops.c b/kernel/fs/mntfs/mntvnops.c index 75caca3338..51a1fa9a24 100644 --- a/kernel/fs/mntfs/mntvnops.c +++ b/kernel/fs/mntfs/mntvnops.c @@ -1004,8 +1004,8 @@ mntgetattr(vnode_t *vp, vattr_t *vap, int flags, cred_t *cr, extern timespec_t vfs_mnttab_ctime; - /* AT_MODE, AT_UID and AT_GID are derived from the underlying file. */ - if (mask & AT_MODE|AT_UID|AT_GID) { + /* VATTR_MODE, VATTR_UID and VATTR_GID are derived from the underlying file. */ + if (mask & VATTR_MODE|VATTR_UID|VATTR_GID) { if (error = fop_getattr(mnp->mnt_mountvp, vap, flags, cr, ct)) return (error); } @@ -1018,7 +1018,7 @@ mntgetattr(vnode_t *vp, vattr_t *vap, int flags, cred_t *cr, * simply hold vfslist for the entire calculation because we might need * to call mntfs_snapshot(), which calls vfs_list_read_lock(). */ - if (mask & AT_SIZE|AT_NBLOCKS) { + if (mask & VATTR_SIZE|VATTR_NBLOCKS) { rw_enter(&mnp->mnt_contents, RW_WRITER); vfs_list_read_lock(); @@ -1067,44 +1067,44 @@ mntgetattr(vnode_t *vp, vattr_t *vap, int flags, cred_t *cr, } rw_exit(&mnp->mnt_contents); - } else if (mask & AT_ATIME|AT_MTIME) { + } else if (mask & VATTR_ATIME|VATTR_MTIME) { vfs_list_read_lock(); vfs_mnttab_modtime(&mtime); vfs_list_unlock(); } /* Always look like a regular file. */ - if (mask & AT_TYPE) + if (mask & VATTR_TYPE) vap->va_type = VREG; /* Mode should basically be read only. */ - if (mask & AT_MODE) + if (mask & VATTR_MODE) vap->va_mode &= 07444; - if (mask & AT_FSID) + if (mask & VATTR_FSID) vap->va_fsid = vp->v_vfsp->vfs_dev; /* Nodeid is always ROOTINO. */ - if (mask & AT_NODEID) + if (mask & VATTR_NODEID) vap->va_nodeid = (ino64_t)MNTROOTINO; /* * Set nlink to the number of open vnodes for mnttab info * plus one for existing. */ - if (mask & AT_NLINK) + if (mask & VATTR_NLINK) vap->va_nlink = mntdata->mnt_nopen + 1; - if (mask & AT_SIZE) + if (mask & VATTR_SIZE) vap->va_size = size; - if (mask & AT_ATIME) + if (mask & VATTR_ATIME) vap->va_atime = mtime; - if (mask & AT_MTIME) + if (mask & VATTR_MTIME) vap->va_mtime = mtime; - if (mask & AT_CTIME) + if (mask & VATTR_CTIME) vap->va_ctime = vfs_mnttab_ctime; - if (mask & AT_RDEV) + if (mask & VATTR_RDEV) vap->va_rdev = 0; - if (mask & AT_BLKSIZE) + if (mask & VATTR_BLKSIZE) vap->va_blksize = DEV_BSIZE; - if (mask & AT_NBLOCKS) + if (mask & VATTR_NBLOCKS) vap->va_nblocks = btod(size); - if (mask & AT_SEQ) + if (mask & VATTR_SEQ) vap->va_seq = 0; return (0); @@ -1306,7 +1306,7 @@ mntfs_special_info_string(char *path, uint_t *major, uint_t *minor, cred_t *cr) lookupnameat(path + 1, UIO_SYSSPACE, FOLLOW, NULLVPP, &vp, rootdir)) return (0); - vattr.va_mask = AT_TYPE | AT_RDEV; + vattr.va_mask = VATTR_TYPE | VATTR_RDEV; error = fop_getattr(vp, &vattr, ATTR_REAL, cr, NULL); VN_RELE(vp); diff --git a/kernel/fs/namefs/namevfs.c b/kernel/fs/namefs/namevfs.c index 4ca7f529ba..b658e7bbdd 100644 --- a/kernel/fs/namefs/namevfs.c +++ b/kernel/fs/namefs/namevfs.c @@ -399,11 +399,11 @@ nm_mount(vfs_t *vfsp, vnode_t *mvp, struct mounta *uap, cred_t *crp) mutex_init(&nodep->nm_lock, NULL, MUTEX_DEFAULT, NULL); vattrp = &nodep->nm_vattr; - vattrp->va_mask = AT_ALL; + vattrp->va_mask = VATTR_ALL; if (error = fop_getattr(mvp, vattrp, 0, crp, NULL)) goto out; - filevattr.va_mask = AT_ALL; + filevattr.va_mask = VATTR_ALL; if (error = fop_getattr(filevp, &filevattr, 0, crp, NULL)) goto out; /* diff --git a/kernel/fs/namefs/namevno.c b/kernel/fs/namefs/namevno.c index 2c0b78dedb..c3a3a9da6f 100644 --- a/kernel/fs/namefs/namevno.c +++ b/kernel/fs/namefs/namevno.c @@ -226,7 +226,7 @@ nm_getattr(vnode_t *vp, vattr_t *vap, int flags, cred_t *crp, bcopy(&nodep->nm_vattr, vap, sizeof (vattr_t)); mutex_exit(&nodep->nm_lock); - if ((va.va_mask = vap->va_mask & AT_SIZE) != 0) { + if ((va.va_mask = vap->va_mask & VATTR_SIZE) != 0) { if (error = fop_getattr(nodep->nm_filevp, &va, flags, crp, ct)) return (error); vap->va_size = va.va_size; @@ -271,7 +271,7 @@ nm_setattr(vnode_t *vp, vattr_t *vap, int flags, cred_t *crp, /* * Cannot set these attributes. */ - if (mask & (AT_NOSET|AT_SIZE)) + if (mask & (VATTR_NOSET|VATTR_SIZE)) return (EINVAL); (void) fop_rwlock(nodep->nm_filevp, V_WRITELOCK_TRUE, ctp); @@ -292,7 +292,7 @@ nm_setattr(vnode_t *vp, vattr_t *vap, int flags, cred_t *crp, * If request to change mode, copy new * mode into existing attribute structure. */ - if (mask & AT_MODE) + if (mask & VATTR_MODE) nmvap->va_mode = vap->va_mode & ~VSVTX; /* @@ -302,17 +302,17 @@ nm_setattr(vnode_t *vp, vattr_t *vap, int flags, cred_t *crp, * owner is not permitted to give away the file, and can change * the group id only to a group of which they are a member. */ - if (mask & AT_UID) + if (mask & VATTR_UID) nmvap->va_uid = vap->va_uid; - if (mask & AT_GID) + if (mask & VATTR_GID) nmvap->va_gid = vap->va_gid; /* * If request is to modify times, make sure user has write * permissions on the file. */ - if (mask & AT_ATIME) + if (mask & VATTR_ATIME) nmvap->va_atime = vap->va_atime; - if (mask & AT_MTIME) { + if (mask & VATTR_MTIME) { nmvap->va_mtime = vap->va_mtime; gethrestime(&nmvap->va_ctime); } diff --git a/kernel/fs/nbmlock.c b/kernel/fs/nbmlock.c index b7cf2765cb..01cbf97eff 100644 --- a/kernel/fs/nbmlock.c +++ b/kernel/fs/nbmlock.c @@ -137,7 +137,7 @@ nbl_svmand(vnode_t *vp, cred_t *cr, int *svp) struct vattr va; int error; - va.va_mask = AT_MODE; + va.va_mask = VATTR_MODE; error = fop_getattr(vp, &va, 0, cr, NULL); if (error != 0) return (error); diff --git a/kernel/fs/nfs/nfs3_srv.c b/kernel/fs/nfs/nfs3_srv.c index 63fd80a7c4..9670bd52a6 100644 --- a/kernel/fs/nfs/nfs3_srv.c +++ b/kernel/fs/nfs/nfs3_srv.c @@ -103,7 +103,7 @@ rfs3_getattr(GETATTR3args *args, GETATTR3res *resp, struct exportinfo *exi, goto out; } - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; error = rfs4_delegated_getattr(vp, &va, 0, cr); if (!error) { @@ -188,14 +188,14 @@ rfs3_setattr(SETATTR3args *args, SETATTR3res *resp, struct exportinfo *exi, * delegated this file. If so, then we return JUKEBOX to * allow the client to retrasmit its request. */ - if (vp->v_type == VREG && (ava.va_mask & AT_SIZE)) { + if (vp->v_type == VREG && (ava.va_mask & VATTR_SIZE)) { if (nbl_need_check(vp)) { nbl_start_crit(vp, RW_READER); in_crit = 1; } } - bva.va_mask = AT_ALL; + bva.va_mask = VATTR_ALL; error = rfs4_delegated_getattr(vp, &bva, 0, cr); /* @@ -228,7 +228,7 @@ rfs3_setattr(SETATTR3args *args, SETATTR3res *resp, struct exportinfo *exi, * If the filesystem is exported with nosuid, then mask off * the setuid and setgid bits. */ - if ((ava.va_mask & AT_MODE) && vp->v_type == VREG && + if ((ava.va_mask & VATTR_MODE) && vp->v_type == VREG && (exi->exi_export.ex_flags & EX_NOSUID)) ava.va_mode &= ~(VSUID | VSGID); @@ -254,7 +254,7 @@ rfs3_setattr(SETATTR3args *args, SETATTR3res *resp, struct exportinfo *exi, * size of the file if there is a conflicting non-blocking * mandatory lock in the region the change. */ - if (vp->v_type == VREG && (ava.va_mask & AT_SIZE)) { + if (vp->v_type == VREG && (ava.va_mask & VATTR_SIZE)) { if (in_crit) { uoff_t offset; ssize_t length; @@ -274,7 +274,7 @@ rfs3_setattr(SETATTR3args *args, SETATTR3res *resp, struct exportinfo *exi, } if (crgetuid(cr) == bva.va_uid && ava.va_size != bva.va_size) { - ava.va_mask &= ~AT_SIZE; + ava.va_mask &= ~VATTR_SIZE; bf.l_type = F_WRLCK; bf.l_whence = 0; bf.l_start = (off64_t)ava.va_size; @@ -295,7 +295,7 @@ rfs3_setattr(SETATTR3args *args, SETATTR3res *resp, struct exportinfo *exi, goto out1; } - ava.va_mask = AT_ALL; + ava.va_mask = VATTR_ALL; avap = rfs4_delegated_getattr(vp, &ava, 0, cr) ? NULL : &ava; /* @@ -386,7 +386,7 @@ rfs3_lookup(LOOKUP3args *args, LOOKUP3res *resp, struct exportinfo *exi, } } - dva.va_mask = AT_ALL; + dva.va_mask = VATTR_ALL; dvap = fop_getattr(dvp, &dva, 0, cr, NULL) ? NULL : &dva; if (args->what.name == nfs3nametoolong) { @@ -433,7 +433,7 @@ rfs3_lookup(LOOKUP3args *args, LOOKUP3res *resp, struct exportinfo *exi, if (name != args->what.name) kmem_free(name, MAXPATHLEN + 1); - dva.va_mask = AT_ALL; + dva.va_mask = VATTR_ALL; dvap = fop_getattr(dvp, &dva, 0, cr, NULL) ? NULL : &dva; if (error) @@ -461,7 +461,7 @@ rfs3_lookup(LOOKUP3args *args, LOOKUP3res *resp, struct exportinfo *exi, goto out; } - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; vap = rfs4_delegated_getattr(vp, &va, 0, cr) ? NULL : &va; VN_RELE(vp); @@ -547,7 +547,7 @@ rfs3_access(ACCESS3args *args, ACCESS3res *resp, struct exportinfo *exi, * mandatory lock files is denied on the server, so it might * as well be reflected to the server during the open. */ - va.va_mask = AT_MODE; + va.va_mask = VATTR_MODE; error = fop_getattr(vp, &va, 0, cr, NULL); if (error) goto out; @@ -601,7 +601,7 @@ rfs3_access(ACCESS3args *args, ACCESS3res *resp, struct exportinfo *exi, resp->resok.access |= ACCESS3_EXECUTE; } - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; vap = rfs4_delegated_getattr(vp, &va, 0, cr) ? NULL : &va; resp->status = NFS3_OK; @@ -662,7 +662,7 @@ rfs3_readlink(READLINK3args *args, READLINK3res *resp, struct exportinfo *exi, goto out; } - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; error = fop_getattr(vp, &va, 0, cr, NULL); if (error) goto out; @@ -719,7 +719,7 @@ rfs3_readlink(READLINK3args *args, READLINK3res *resp, struct exportinfo *exi, *(data + MAXPATHLEN - uio.uio_resid) = '\0'; } - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; vap = fop_getattr(vp, &va, 0, cr, NULL) ? NULL : &va; /* Lie about object type again just to be consistent */ @@ -874,7 +874,7 @@ rfs3_read(READ3args *args, READ3res *resp, struct exportinfo *exi, need_rwunlock = 1; - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; error = fop_getattr(vp, &va, 0, cr, &ct); /* @@ -1027,7 +1027,7 @@ doio_read: ASSERT(mp != NULL); } - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; error = fop_getattr(vp, &va, 0, cr, &ct); if (error) @@ -1186,7 +1186,7 @@ rfs3_write(WRITE3args *args, WRITE3res *resp, struct exportinfo *exi, } - bva.va_mask = AT_ALL; + bva.va_mask = VATTR_ALL; error = fop_getattr(vp, &bva, 0, cr, &ct); /* @@ -1305,7 +1305,7 @@ rfs3_write(WRITE3args *args, WRITE3res *resp, struct exportinfo *exi, goto err1; } - ava.va_mask = AT_ALL; + ava.va_mask = VATTR_ALL; avap = fop_getattr(vp, &ava, 0, cr, &ct) ? NULL : &ava; if (error) @@ -1396,7 +1396,7 @@ rfs3_create(CREATE3args *args, CREATE3res *resp, struct exportinfo *exi, goto out; } - dbva.va_mask = AT_ALL; + dbva.va_mask = VATTR_ALL; dbvap = fop_getattr(dvp, &dbva, 0, cr, NULL) ? NULL : &dbva; davap = dbvap; @@ -1426,7 +1426,7 @@ rfs3_create(CREATE3args *args, CREATE3res *resp, struct exportinfo *exi, } if (args->how.mode == EXCLUSIVE) { - va.va_mask = AT_TYPE | AT_MODE | AT_MTIME; + va.va_mask = VATTR_TYPE | VATTR_MODE | VATTR_MTIME; va.va_type = VREG; va.va_mode = (mode_t)0; /* @@ -1441,7 +1441,7 @@ rfs3_create(CREATE3args *args, CREATE3res *resp, struct exportinfo *exi, &va); if (error) goto out; - va.va_mask |= AT_TYPE; + va.va_mask |= VATTR_TYPE; va.va_type = VREG; if (args->how.mode == GUARDED) excl = EXCL; @@ -1456,7 +1456,7 @@ rfs3_create(CREATE3args *args, CREATE3res *resp, struct exportinfo *exi, * being modified. If there are conflicting locks fail * the operation with EACCES. */ - if (va.va_mask & AT_SIZE) { + if (va.va_mask & VATTR_SIZE) { struct vattr tva; /* @@ -1489,7 +1489,7 @@ rfs3_create(CREATE3args *args, CREATE3res *resp, struct exportinfo *exi, nbl_start_crit(tvp, RW_READER); in_crit = 1; - tva.va_mask = AT_SIZE; + tva.va_mask = VATTR_SIZE; error = fop_getattr(tvp, &tva, 0, cr, NULL); /* @@ -1515,14 +1515,14 @@ rfs3_create(CREATE3args *args, CREATE3res *resp, struct exportinfo *exi, } } } - if (va.va_mask & AT_SIZE) + if (va.va_mask & VATTR_SIZE) reqsize = va.va_size; } /* * Must specify the mode. */ - if (!(va.va_mask & AT_MODE)) { + if (!(va.va_mask & VATTR_MODE)) { resp->status = NFS3ERR_INVAL; goto out1; } @@ -1544,7 +1544,7 @@ tryagain: error = fop_create(dvp, name, &va, excl, VWRITE, &vp, cr, 0, NULL, NULL); - dava.va_mask = AT_ALL; + dava.va_mask = VATTR_ALL; davap = fop_getattr(dvp, &dava, 0, cr, NULL) ? NULL : &dava; if (error) { @@ -1589,7 +1589,7 @@ tryagain: goto out1; } - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; vap = fop_getattr(vp, &va, 0, cr, NULL) ? NULL : &va; mtime = (nfstime3 *)&args->how.createhow3_u.verf; @@ -1618,7 +1618,7 @@ tryagain: goto out1; } - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; vap = fop_getattr(vp, &va, 0, cr, NULL) ? NULL : &va; /* @@ -1638,10 +1638,10 @@ tryagain: args->how.mode == GUARDED) && args->how.createhow3_u.obj_attributes.size.set_it && vap->va_size != reqsize) { - va.va_mask = AT_SIZE; + va.va_mask = VATTR_SIZE; va.va_size = reqsize; (void) fop_setattr(vp, &va, 0, cr, NULL); - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; vap = fop_getattr(vp, &va, 0, cr, NULL) ? NULL : &va; } } @@ -1737,7 +1737,7 @@ rfs3_mkdir(MKDIR3args *args, MKDIR3res *resp, struct exportinfo *exi, goto out; } - dbva.va_mask = AT_ALL; + dbva.va_mask = VATTR_ALL; dbvap = fop_getattr(dvp, &dbva, 0, cr, NULL) ? NULL : &dbva; davap = dbvap; @@ -1760,7 +1760,7 @@ rfs3_mkdir(MKDIR3args *args, MKDIR3res *resp, struct exportinfo *exi, if (error) goto out; - if (!(va.va_mask & AT_MODE)) { + if (!(va.va_mask & VATTR_MODE)) { resp->status = NFS3ERR_INVAL; goto out1; } @@ -1774,7 +1774,7 @@ rfs3_mkdir(MKDIR3args *args, MKDIR3res *resp, struct exportinfo *exi, goto out1; } - va.va_mask |= AT_TYPE; + va.va_mask |= VATTR_TYPE; va.va_type = VDIR; error = fop_mkdir(dvp, name, &va, &vp, cr, NULL, 0, NULL); @@ -1782,7 +1782,7 @@ rfs3_mkdir(MKDIR3args *args, MKDIR3res *resp, struct exportinfo *exi, if (name != args->where.name) kmem_free(name, MAXPATHLEN + 1); - dava.va_mask = AT_ALL; + dava.va_mask = VATTR_ALL; davap = fop_getattr(dvp, &dava, 0, cr, NULL) ? NULL : &dava; /* @@ -1799,7 +1799,7 @@ rfs3_mkdir(MKDIR3args *args, MKDIR3res *resp, struct exportinfo *exi, else resp->resok.obj.handle_follows = TRUE; - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; vap = fop_getattr(vp, &va, 0, cr, NULL) ? NULL : &va; /* @@ -1870,7 +1870,7 @@ rfs3_symlink(SYMLINK3args *args, SYMLINK3res *resp, struct exportinfo *exi, goto err; } - dbva.va_mask = AT_ALL; + dbva.va_mask = VATTR_ALL; dbvap = fop_getattr(dvp, &dbva, 0, cr, NULL) ? NULL : &dbva; davap = dbvap; @@ -1893,7 +1893,7 @@ rfs3_symlink(SYMLINK3args *args, SYMLINK3res *resp, struct exportinfo *exi, if (error) goto err; - if (!(va.va_mask & AT_MODE)) { + if (!(va.va_mask & VATTR_MODE)) { resp->status = NFS3ERR_INVAL; goto err1; } @@ -1922,12 +1922,12 @@ rfs3_symlink(SYMLINK3args *args, SYMLINK3res *resp, struct exportinfo *exi, } - va.va_mask |= AT_TYPE; + va.va_mask |= VATTR_TYPE; va.va_type = VLNK; error = fop_symlink(dvp, name, &va, symdata, cr, NULL, 0); - dava.va_mask = AT_ALL; + dava.va_mask = VATTR_ALL; davap = fop_getattr(dvp, &dava, 0, cr, NULL) ? NULL : &dava; if (error) @@ -1956,7 +1956,7 @@ rfs3_symlink(SYMLINK3args *args, SYMLINK3res *resp, struct exportinfo *exi, else resp->resok.obj.handle_follows = TRUE; - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; vap = fop_getattr(vp, &va, 0, cr, NULL) ? NULL : &va; /* @@ -2030,7 +2030,7 @@ rfs3_mknod(MKNOD3args *args, MKNOD3res *resp, struct exportinfo *exi, goto out; } - dbva.va_mask = AT_ALL; + dbva.va_mask = VATTR_ALL; dbvap = fop_getattr(dvp, &dbva, 0, cr, NULL) ? NULL : &dbva; davap = dbvap; @@ -2067,7 +2067,7 @@ rfs3_mknod(MKNOD3args *args, MKNOD3res *resp, struct exportinfo *exi, va.va_rdev = makedevice( args->what.mknoddata3_u.device.spec.specdata1, args->what.mknoddata3_u.device.spec.specdata2); - va.va_mask |= AT_TYPE | AT_RDEV; + va.va_mask |= VATTR_TYPE | VATTR_RDEV; break; case NF3SOCK: error = sattr3_to_vattr( @@ -2075,7 +2075,7 @@ rfs3_mknod(MKNOD3args *args, MKNOD3res *resp, struct exportinfo *exi, if (error) goto out; va.va_type = VSOCK; - va.va_mask |= AT_TYPE; + va.va_mask |= VATTR_TYPE; break; case NF3FIFO: error = sattr3_to_vattr( @@ -2083,7 +2083,7 @@ rfs3_mknod(MKNOD3args *args, MKNOD3res *resp, struct exportinfo *exi, if (error) goto out; va.va_type = VFIFO; - va.va_mask |= AT_TYPE; + va.va_mask |= VATTR_TYPE; break; default: resp->status = NFS3ERR_BADTYPE; @@ -2093,7 +2093,7 @@ rfs3_mknod(MKNOD3args *args, MKNOD3res *resp, struct exportinfo *exi, /* * Must specify the mode. */ - if (!(va.va_mask & AT_MODE)) { + if (!(va.va_mask & VATTR_MODE)) { resp->status = NFS3ERR_INVAL; goto out1; } @@ -2117,7 +2117,7 @@ rfs3_mknod(MKNOD3args *args, MKNOD3res *resp, struct exportinfo *exi, if (name != args->where.name) kmem_free(name, MAXPATHLEN + 1); - dava.va_mask = AT_ALL; + dava.va_mask = VATTR_ALL; davap = fop_getattr(dvp, &dava, 0, cr, NULL) ? NULL : &dava; /* @@ -2136,7 +2136,7 @@ rfs3_mknod(MKNOD3args *args, MKNOD3res *resp, struct exportinfo *exi, else resp->resok.obj.handle_follows = TRUE; - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; vap = fop_getattr(vp, &va, 0, cr, NULL) ? NULL : &va; /* @@ -2206,7 +2206,7 @@ rfs3_remove(REMOVE3args *args, REMOVE3res *resp, struct exportinfo *exi, goto err; } - bva.va_mask = AT_ALL; + bva.va_mask = VATTR_ALL; bvap = fop_getattr(vp, &bva, 0, cr, NULL) ? NULL : &bva; avap = bvap; @@ -2267,7 +2267,7 @@ rfs3_remove(REMOVE3args *args, REMOVE3res *resp, struct exportinfo *exi, VN_RELE(targvp); targvp = NULL; - ava.va_mask = AT_ALL; + ava.va_mask = VATTR_ALL; avap = fop_getattr(vp, &ava, 0, cr, NULL) ? NULL : &ava; /* @@ -2334,7 +2334,7 @@ rfs3_rmdir(RMDIR3args *args, RMDIR3res *resp, struct exportinfo *exi, goto err; } - bva.va_mask = AT_ALL; + bva.va_mask = VATTR_ALL; bvap = fop_getattr(vp, &bva, 0, cr, NULL) ? NULL : &bva; avap = bvap; @@ -2372,7 +2372,7 @@ rfs3_rmdir(RMDIR3args *args, RMDIR3res *resp, struct exportinfo *exi, if (name != args->object.name) kmem_free(name, MAXPATHLEN + 1); - ava.va_mask = AT_ALL; + ava.va_mask = VATTR_ALL; avap = fop_getattr(vp, &ava, 0, cr, NULL) ? NULL : &ava; /* @@ -2458,7 +2458,7 @@ rfs3_rename(RENAME3args *args, RENAME3res *resp, struct exportinfo *exi, goto err; } - fbva.va_mask = AT_ALL; + fbva.va_mask = VATTR_ALL; fbvap = fop_getattr(fvp, &fbva, 0, cr, NULL) ? NULL : &fbva; favap = fbvap; @@ -2481,7 +2481,7 @@ rfs3_rename(RENAME3args *args, RENAME3res *resp, struct exportinfo *exi, goto err; } - tbva.va_mask = AT_ALL; + tbva.va_mask = VATTR_ALL; tbvap = fop_getattr(tvp, &tbva, 0, cr, NULL) ? NULL : &tbva; tavap = tbvap; @@ -2574,9 +2574,9 @@ rfs3_rename(RENAME3args *args, RENAME3res *resp, struct exportinfo *exi, VN_RELE(srcvp); srcvp = NULL; - fava.va_mask = AT_ALL; + fava.va_mask = VATTR_ALL; favap = fop_getattr(fvp, &fava, 0, cr, NULL) ? NULL : &fava; - tava.va_mask = AT_ALL; + tava.va_mask = VATTR_ALL; tavap = fop_getattr(tvp, &tava, 0, cr, NULL) ? NULL : &tava; /* @@ -2658,7 +2658,7 @@ rfs3_link(LINK3args *args, LINK3res *resp, struct exportinfo *exi, goto out; } - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; vap = fop_getattr(vp, &va, 0, cr, NULL) ? NULL : &va; fh3 = &args->link.dir; @@ -2680,7 +2680,7 @@ rfs3_link(LINK3args *args, LINK3res *resp, struct exportinfo *exi, goto out; } - bva.va_mask = AT_ALL; + bva.va_mask = VATTR_ALL; bvap = fop_getattr(dvp, &bva, 0, cr, NULL) ? NULL : &bva; if (dvp->v_type != VDIR) { @@ -2714,9 +2714,9 @@ rfs3_link(LINK3args *args, LINK3res *resp, struct exportinfo *exi, error = fop_link(dvp, vp, name, cr, NULL, 0); - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; vap = fop_getattr(vp, &va, 0, cr, NULL) ? NULL : &va; - ava.va_mask = AT_ALL; + ava.va_mask = VATTR_ALL; avap = fop_getattr(dvp, &ava, 0, cr, NULL) ? NULL : &ava; /* @@ -2830,7 +2830,7 @@ rfs3_readdir(READDIR3args *args, READDIR3res *resp, struct exportinfo *exi, (void) fop_rwlock(vp, V_WRITELOCK_FALSE, NULL); - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; vap = fop_getattr(vp, &va, 0, cr, NULL) ? NULL : &va; if (vp->v_type != VDIR) { @@ -2871,7 +2871,7 @@ rfs3_readdir(READDIR3args *args, READDIR3res *resp, struct exportinfo *exi, error = fop_readdir(vp, &uio, cr, &iseof, NULL, 0); - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; vap = fop_getattr(vp, &va, 0, cr, NULL) ? NULL : &va; if (error) { @@ -3085,7 +3085,7 @@ rfs3_readdirplus(READDIRPLUS3args *args, READDIRPLUS3res *resp, (void) fop_rwlock(vp, V_WRITELOCK_FALSE, NULL); - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; vap = fop_getattr(vp, &va, 0, cr, NULL) ? NULL : &va; if (vp->v_type != VDIR) { @@ -3246,7 +3246,7 @@ getmoredents: /* else, fall through */ } good: - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; vap = fop_getattr(vp, &va, 0, cr, NULL) ? NULL : &va; fop_rwunlock(vp, V_WRITELOCK_FALSE, NULL); @@ -3275,7 +3275,7 @@ good: continue; } - nva.va_mask = AT_ALL; + nva.va_mask = VATTR_ALL; nvap = rfs4_delegated_getattr(nvp, &nva, 0, cr) ? NULL : &nva; /* Lie about the object type for a referral */ @@ -3411,7 +3411,7 @@ rfs3_fsstat(FSSTAT3args *args, FSSTAT3res *resp, struct exportinfo *exi, error = VFS_STATVFS(vp->v_vfsp, &sb); - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; vap = fop_getattr(vp, &va, 0, cr, NULL) ? NULL : &va; if (error) @@ -3491,7 +3491,7 @@ rfs3_fsinfo(FSINFO3args *args, FSINFO3res *resp, struct exportinfo *exi, goto out; } - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; vap = fop_getattr(vp, &va, 0, cr, NULL) ? NULL : &va; resp->status = NFS3_OK; @@ -3578,7 +3578,7 @@ rfs3_pathconf(PATHCONF3args *args, PATHCONF3res *resp, struct exportinfo *exi, goto out; } - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; vap = fop_getattr(vp, &va, 0, cr, NULL) ? NULL : &va; error = fop_pathconf(vp, _PC_LINK_MAX, &val, cr, NULL); @@ -3661,7 +3661,7 @@ rfs3_commit(COMMIT3args *args, COMMIT3res *resp, struct exportinfo *exi, goto out; } - bva.va_mask = AT_ALL; + bva.va_mask = VATTR_ALL; error = fop_getattr(vp, &bva, 0, cr, NULL); /* @@ -3689,7 +3689,7 @@ rfs3_commit(COMMIT3args *args, COMMIT3res *resp, struct exportinfo *exi, error = fop_fsync(vp, FSYNC, cr, NULL); - ava.va_mask = AT_ALL; + ava.va_mask = VATTR_ALL; avap = fop_getattr(vp, &ava, 0, cr, NULL) ? NULL : &ava; if (error) @@ -3736,21 +3736,21 @@ sattr3_to_vattr(sattr3 *sap, struct vattr *vap) if (sap->mode.set_it) { vap->va_mode = (mode_t)sap->mode.mode; - vap->va_mask |= AT_MODE; + vap->va_mask |= VATTR_MODE; } if (sap->uid.set_it) { vap->va_uid = (uid_t)sap->uid.uid; - vap->va_mask |= AT_UID; + vap->va_mask |= VATTR_UID; } if (sap->gid.set_it) { vap->va_gid = (gid_t)sap->gid.gid; - vap->va_mask |= AT_GID; + vap->va_mask |= VATTR_GID; } if (sap->size.set_it) { if (sap->size.size > (size3)((u_longlong_t)-1)) return (EINVAL); vap->va_size = sap->size.size; - vap->va_mask |= AT_SIZE; + vap->va_mask |= VATTR_SIZE; } if (sap->atime.set_it == SET_TO_CLIENT_TIME) { #ifndef _LP64 @@ -3765,10 +3765,10 @@ sattr3_to_vattr(sattr3 *sap, struct vattr *vap) NFS_TIME_T_CONVERT(vap->va_atime.tv_sec, sap->atime.atime.seconds); vap->va_atime.tv_nsec = (uint32_t)sap->atime.atime.nseconds; - vap->va_mask |= AT_ATIME; + vap->va_mask |= VATTR_ATIME; } else if (sap->atime.set_it == SET_TO_SERVER_TIME) { gethrestime(&vap->va_atime); - vap->va_mask |= AT_ATIME; + vap->va_mask |= VATTR_ATIME; } if (sap->mtime.set_it == SET_TO_CLIENT_TIME) { #ifndef _LP64 @@ -3783,10 +3783,10 @@ sattr3_to_vattr(sattr3 *sap, struct vattr *vap) NFS_TIME_T_CONVERT(vap->va_mtime.tv_sec, sap->mtime.mtime.seconds); vap->va_mtime.tv_nsec = (uint32_t)sap->mtime.mtime.nseconds; - vap->va_mask |= AT_MTIME; + vap->va_mask |= VATTR_MTIME; } else if (sap->mtime.set_it == SET_TO_SERVER_TIME) { gethrestime(&vap->va_mtime); - vap->va_mask |= AT_MTIME; + vap->va_mask |= VATTR_MTIME; } return (0); diff --git a/kernel/fs/nfs/nfs3_vfsops.c b/kernel/fs/nfs/nfs3_vfsops.c index caf9731a39..672c5c6b56 100644 --- a/kernel/fs/nfs/nfs3_vfsops.c +++ b/kernel/fs/nfs/nfs3_vfsops.c @@ -1292,7 +1292,7 @@ nfs3rootvp(vnode_t **rtvpp, vfs_t *vfsp, struct servinfo *svp, /* If we didn't get a type, get one now */ if (rtvp->v_type == VNON) { - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; error = nfs3getattr(rtvp, &va, tcr); if (error) @@ -1610,7 +1610,7 @@ nfs3_vget(vfs_t *vfsp, vnode_t **vpp, fid_t *fidp) } if (vp->v_type == VNON) { - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; error = nfs3getattr(vp, &va, CRED()); if (error) { VN_RELE(vp); diff --git a/kernel/fs/nfs/nfs3_vnops.c b/kernel/fs/nfs/nfs3_vnops.c index 3d6c37001d..c45366c0e8 100644 --- a/kernel/fs/nfs/nfs3_vnops.c +++ b/kernel/fs/nfs/nfs3_vnops.c @@ -327,7 +327,7 @@ nfs3_open(vnode_t **vpp, int flag, cred_t *cr, caller_context_t *ct) PURGE_ATTRCACHE(vp); error = 0; } else { - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; error = nfs3_getattr_otw(vp, &va, cr); } } else @@ -684,7 +684,7 @@ nfs3_write(vnode_t *vp, struct uio *uiop, int ioflag, cred_t *cr, return (EINTR); } - va.va_mask = AT_SIZE; + va.va_mask = VATTR_SIZE; error = nfs3getattr(vp, &va, cr); if (error) return (error); @@ -1267,13 +1267,13 @@ nfs3_getattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr, rp = VTOR(vp); if (flags & ATTR_HINT) { if (vap->va_mask == - (vap->va_mask & (AT_SIZE | AT_FSID | AT_RDEV))) { + (vap->va_mask & (VATTR_SIZE | VATTR_FSID | VATTR_RDEV))) { mutex_enter(&rp->r_statelock); - if (vap->va_mask | AT_SIZE) + if (vap->va_mask | VATTR_SIZE) vap->va_size = rp->r_size; - if (vap->va_mask | AT_FSID) + if (vap->va_mask | VATTR_FSID) vap->va_fsid = rp->r_attr.va_fsid; - if (vap->va_mask | AT_RDEV) + if (vap->va_mask | VATTR_RDEV) vap->va_rdev = rp->r_attr.va_rdev; mutex_exit(&rp->r_statelock); return (0); @@ -1285,7 +1285,7 @@ nfs3_getattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr, * and if there any dirty pages or any outstanding * asynchronous (write) requests for this file. */ - if (vap->va_mask & AT_MTIME) { + if (vap->va_mask & VATTR_MTIME) { if (vn_has_cached_data(vp) && ((rp->r_flags & RDIRTY) || rp->r_awcount > 0)) { mutex_enter(&rp->r_statelock); @@ -1314,12 +1314,12 @@ nfs3_setattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr, int error; struct vattr va; - if (vap->va_mask & AT_NOSET) + if (vap->va_mask & VATTR_NOSET) return (EINVAL); if (nfs_zone() != VTOMI(vp)->mi_zone) return (EIO); - va.va_mask = AT_UID | AT_MODE; + va.va_mask = VATTR_UID | VATTR_MODE; error = nfs3getattr(vp, &va, cr); if (error) return (error); @@ -1331,7 +1331,7 @@ nfs3_setattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr, error = nfs3setattr(vp, vap, flags, cr); - if (error == 0 && (vap->va_mask & AT_SIZE) && vap->va_size == 0) + if (error == 0 && (vap->va_mask & VATTR_SIZE) && vap->va_size == 0) vnevent_truncate(vp, ct); return (error); @@ -1389,15 +1389,15 @@ nfs3setattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr) * in an overflow error. Remove these flags from the vap mask * before calling in this case, and restore them afterwards. */ - if ((mask & (AT_ATIME | AT_MTIME)) && !(flags & ATTR_UTIME)) { + if ((mask & (VATTR_ATIME | VATTR_MTIME)) && !(flags & ATTR_UTIME)) { /* Use server times, so don't set the args time fields */ - vap->va_mask &= ~(AT_ATIME | AT_MTIME); + vap->va_mask &= ~(VATTR_ATIME | VATTR_MTIME); error = vattr_to_sattr3(vap, &args.new_attributes); - vap->va_mask |= (mask & (AT_ATIME | AT_MTIME)); - if (mask & AT_ATIME) { + vap->va_mask |= (mask & (VATTR_ATIME | VATTR_MTIME)); + if (mask & VATTR_ATIME) { args.new_attributes.atime.set_it = SET_TO_SERVER_TIME; } - if (mask & AT_MTIME) { + if (mask & VATTR_MTIME) { args.new_attributes.mtime.set_it = SET_TO_SERVER_TIME; } } else { @@ -1410,14 +1410,14 @@ nfs3setattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr) return (error); } - va.va_mask = AT_MODE | AT_CTIME; + va.va_mask = VATTR_MODE | VATTR_CTIME; error = nfs3getattr(vp, &va, cr); if (error) return (error); omode = va.va_mode; tryagain: - if (mask & AT_SIZE) { + if (mask & VATTR_SIZE) { args.guard.check = TRUE; args.guard.obj_ctime.seconds = va.va_ctime.tv_sec; args.guard.obj_ctime.nseconds = va.va_ctime.tv_nsec; @@ -1439,7 +1439,7 @@ tryagain: * change the access permissions of the file, so purge old * information and start over again. */ - if (mask & (AT_UID | AT_GID | AT_MODE)) { + if (mask & (VATTR_UID | VATTR_GID | VATTR_MODE)) { (void) nfs_access_purge_rp(rp); if (rp->r_secattr != NULL) { mutex_enter(&rp->r_statelock); @@ -1470,7 +1470,7 @@ tryagain: * back in. A read should be cheaper than a * write. */ - if (mask & AT_SIZE) { + if (mask & VATTR_SIZE) { nfs_invalidate_pages(vp, (vap->va_size & PAGEMASK), cr); } @@ -1480,16 +1480,16 @@ tryagain: * and setgid bits when changing the uid or gid. The * client needs to compensate appropriately. */ - if (mask & (AT_UID | AT_GID)) { + if (mask & (VATTR_UID | VATTR_GID)) { int terror; - va.va_mask = AT_MODE; + va.va_mask = VATTR_MODE; terror = nfs3getattr(vp, &va, cr); if (!terror && - (((mask & AT_MODE) && va.va_mode != vap->va_mode) || - (!(mask & AT_MODE) && va.va_mode != omode))) { - va.va_mask = AT_MODE; - if (mask & AT_MODE) + (((mask & VATTR_MODE) && va.va_mode != vap->va_mode) || + (!(mask & VATTR_MODE) && va.va_mode != omode))) { + va.va_mask = VATTR_MODE; + if (mask & VATTR_MODE) va.va_mode = vap->va_mode; else va.va_mode = omode; @@ -1511,7 +1511,7 @@ tryagain: * required. */ if (res.status == NFS3ERR_NOT_SYNC) { - va.va_mask = AT_CTIME; + va.va_mask = VATTR_CTIME; if (nfs3getattr(vp, &va, cr) == 0) goto tryagain; } @@ -2194,7 +2194,7 @@ nfs3lookup_otw(vnode_t *dvp, char *nm, vnode_t **vpp, cred_t *cr, vp = makenfs3node_va(&res.object, NULL, dvp->v_vfsp, t, cr, VTOR(dvp)->r_path, nm); if (vp->v_type == VNON) { - vattr.va_mask = AT_TYPE; + vattr.va_mask = VATTR_TYPE; error = nfs3getattr(vp, &vattr, cr); if (error) { VN_RELE(vp); @@ -2287,7 +2287,7 @@ top: VN_RELE(tempvp); } if (!(error = fop_access(vp, mode, 0, cr, ct))) { - if ((vattr.va_mask & AT_SIZE) && + if ((vattr.va_mask & VATTR_SIZE) && vp->v_type == VREG) { rp = VTOR(vp); /* @@ -2302,7 +2302,7 @@ top: mutex_exit(&rp->r_statelock); } if (!error) { - vattr.va_mask = AT_SIZE; + vattr.va_mask = VATTR_SIZE; error = nfs3setattr(vp, &vattr, 0, cr); @@ -2336,11 +2336,11 @@ top: nfs_rw_exit(&drp->r_rwlock); return (error); } - vattr.va_mask |= AT_GID; + vattr.va_mask |= VATTR_GID; - ASSERT(vattr.va_mask & AT_TYPE); + ASSERT(vattr.va_mask & VATTR_TYPE); if (vattr.va_type == VREG) { - ASSERT(vattr.va_mask & AT_MODE); + ASSERT(vattr.va_mask & VATTR_MODE); if (MANDMODE(vattr.va_mode)) { nfs_rw_exit(&drp->r_rwlock); return (EACCES); @@ -2488,7 +2488,7 @@ nfs3create(vnode_t *dvp, char *nm, struct vattr *va, enum vcexcl exclusive, * the attributes. */ if (exclusive == EXCL) - va->va_mask |= (AT_MTIME | AT_ATIME); + va->va_mask |= (VATTR_MTIME | VATTR_ATIME); if (!res.resok.obj.handle_follows) { error = nfs3lookup(dvp, nm, &vp, NULL, 0, NULL, cr, 0); @@ -2538,7 +2538,7 @@ nfs3create(vnode_t *dvp, char *nm, struct vattr *va, enum vcexcl exclusive, * attrs were returned. */ if (vp->v_type == VNON) { - vattr.va_mask = AT_TYPE; + vattr.va_mask = VATTR_TYPE; error = nfs3getattr(vp, &vattr, cr); if (error) { VN_RELE(vp); @@ -2556,7 +2556,7 @@ nfs3create(vnode_t *dvp, char *nm, struct vattr *va, enum vcexcl exclusive, * Check here for large file handled by * LF-unaware process (as ufs_create() does) */ - if ((va->va_mask & AT_SIZE) && vp->v_type == VREG && + if ((va->va_mask & VATTR_SIZE) && vp->v_type == VREG && !(lfaware & FOFFMAX)) { mutex_enter(&rp->r_statelock); if (rp->r_size > MAXOFF32_T) { @@ -2568,7 +2568,7 @@ nfs3create(vnode_t *dvp, char *nm, struct vattr *va, enum vcexcl exclusive, } if (exclusive == EXCL && - (va->va_mask & ~(AT_GID | AT_SIZE))) { + (va->va_mask & ~(VATTR_GID | VATTR_SIZE))) { /* * If doing an exclusive create, then generate * a SETATTR to set the initial attributes. @@ -2583,7 +2583,7 @@ nfs3create(vnode_t *dvp, char *nm, struct vattr *va, enum vcexcl exclusive, * earlier in this function if post op attrs * were not available. * - * The AT_GID and AT_SIZE bits are turned off + * The VATTR_GID and VATTR_SIZE bits are turned off * so that the SETATTR request will not attempt * to process these. The gid will be set * separately if appropriate. The size is turned @@ -2593,7 +2593,7 @@ nfs3create(vnode_t *dvp, char *nm, struct vattr *va, enum vcexcl exclusive, * because the file must have existed already. * Therefore, no truncate operation is needed. */ - va->va_mask &= ~(AT_GID | AT_SIZE); + va->va_mask &= ~(VATTR_GID | VATTR_SIZE); error = nfs3setattr(vp, va, 0, cr); if (error) { /* @@ -2617,7 +2617,7 @@ nfs3create(vnode_t *dvp, char *nm, struct vattr *va, enum vcexcl exclusive, * upon the server's semantics for allowing * file ownership changes. */ - va->va_mask = AT_GID; + va->va_mask = VATTR_GID; (void) nfs3setattr(vp, va, 0, cr); } @@ -2698,7 +2698,7 @@ nfs3excl_create_settimes(vnode_t *vp, struct vattr *vap, cred_t *cr) * No need to do the atime/mtime work again so clear * the bits. */ - mask &= ~(AT_ATIME | AT_MTIME); + mask &= ~(VATTR_ATIME | VATTR_MTIME); } else { nfs3_cache_wcc_data(vp, &res.resfail.obj_wcc, t, cr); } @@ -2788,7 +2788,7 @@ nfs3mknod(vnode_t *dvp, char *nm, struct vattr *va, enum vcexcl exclusive, vp = makenfs3node(&res.resok.obj.handle, NULL, dvp->v_vfsp, t, cr, NULL, NULL); if (vp->v_type == VNON) { - vattr.va_mask = AT_TYPE; + vattr.va_mask = VATTR_TYPE; error = nfs3getattr(vp, &vattr, cr); if (error) { VN_RELE(vp); @@ -2802,7 +2802,7 @@ nfs3mknod(vnode_t *dvp, char *nm, struct vattr *va, enum vcexcl exclusive, } if (va->va_gid != VTOR(vp)->r_attr.va_gid) { - va->va_mask = AT_GID; + va->va_mask = VATTR_GID; (void) nfs3setattr(vp, va, 0, cr); } @@ -3395,7 +3395,7 @@ nfs3_mkdir(vnode_t *dvp, char *nm, struct vattr *va, vnode_t **vpp, cred_t *cr, error = setdirmode(dvp, &va->va_mode, cr); if (error) return (error); - va->va_mask |= AT_MODE|AT_GID; + va->va_mask |= VATTR_MODE|VATTR_GID; error = vattr_to_sattr3(va, &args.attributes); if (error) { @@ -3445,7 +3445,7 @@ nfs3_mkdir(vnode_t *dvp, char *nm, struct vattr *va, vnode_t **vpp, cred_t *cr, vp = makenfs3node(&res.resok.obj.handle, NULL, dvp->v_vfsp, t, cr, NULL, NULL); if (vp->v_type == VNON) { - vattr.va_mask = AT_TYPE; + vattr.va_mask = VATTR_TYPE; error = nfs3getattr(vp, &vattr, cr); if (error) { VN_RELE(vp); @@ -3458,7 +3458,7 @@ nfs3_mkdir(vnode_t *dvp, char *nm, struct vattr *va, vnode_t **vpp, cred_t *cr, dnlc_update(dvp, nm, vp); } if (va->va_gid != VTOR(vp)->r_attr.va_gid) { - va->va_mask = AT_GID; + va->va_mask = VATTR_GID; (void) nfs3setattr(vp, va, 0, cr); } *vpp = vp; @@ -5237,7 +5237,7 @@ nfs3_map(vnode_t *vp, offset_t off, struct as *as, caddr_t *addrp, * is timed out and if it is, then an over the wire getattr * will be issued. */ - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; if (vn_has_cached_data(vp) && !(VTOMI(vp)->mi_flags & MI_NOCTO) && !vn_is_readonly(vp)) error = nfs3_getattr_otw(vp, &va, cr); @@ -5512,11 +5512,11 @@ nfs3_space(vnode_t *vp, int cmd, struct flock64 *bfp, int flag, * mtime if we truncate the file to its * previous size. */ - va.va_mask = AT_SIZE; + va.va_mask = VATTR_SIZE; error = nfs3getattr(vp, &va, cr); if (error || va.va_size == bfp->l_start) return (error); - va.va_mask = AT_SIZE; + va.va_mask = VATTR_SIZE; va.va_size = bfp->l_start; error = nfs3setattr(vp, &va, 0, cr); diff --git a/kernel/fs/nfs/nfs3_xdr.c b/kernel/fs/nfs/nfs3_xdr.c index bdf0a4c456..022fd9bae4 100644 --- a/kernel/fs/nfs/nfs3_xdr.c +++ b/kernel/fs/nfs/nfs3_xdr.c @@ -586,7 +586,7 @@ xdr_fattr3_to_vattr(XDR *xdrs, fattr3_res *objp) ASSERT(xdrs->x_op == XDR_DECODE); /* On success, all attributes will be decoded */ - vap->va_mask = AT_ALL; + vap->va_mask = VATTR_ALL; objp->status = 0; ptr = XDR_INLINE(xdrs, NFS3_SIZEOF_FATTR3 * BYTES_PER_XDR_UNIT); diff --git a/kernel/fs/nfs/nfs4_attr.c b/kernel/fs/nfs/nfs4_attr.c index 95f606b9e6..af9102e4b1 100644 --- a/kernel/fs/nfs/nfs4_attr.c +++ b/kernel/fs/nfs/nfs4_attr.c @@ -77,13 +77,13 @@ nfs4_ver_fattr4_attr(vattr_t *vap, struct nfs4_ntov_map *ntovp, * Bit matches the mask */ switch (ntovp->vbit & vap->va_mask) { - case AT_SIZE: + case VATTR_SIZE: nap->size = vap->va_size; break; - case AT_MODE: + case VATTR_MODE: nap->mode = vap->va_mode; break; - case AT_UID: + case VATTR_UID: /* * if no mapping, uid could be mapped to a numeric string, * e.g. 12345->"12345" @@ -92,7 +92,7 @@ nfs4_ver_fattr4_attr(vattr_t *vap, struct nfs4_ntov_map *ntovp, FALSE)) retval = FALSE; break; - case AT_GID: + case VATTR_GID: /* * if no mapping, gid will be mapped to a number string, * e.g. "12345" @@ -101,7 +101,7 @@ nfs4_ver_fattr4_attr(vattr_t *vap, struct nfs4_ntov_map *ntovp, FALSE)) retval = FALSE; break; - case AT_ATIME: + case VATTR_ATIME: if ((ntovp->nval != FATTR4_TIME_ACCESS) || (*errorp = nfs4_time_vton(&vap->va_ctime, &nap->time_access))) { @@ -113,7 +113,7 @@ nfs4_ver_fattr4_attr(vattr_t *vap, struct nfs4_ntov_map *ntovp, retval = FALSE; } break; - case AT_MTIME: + case VATTR_MTIME: if ((ntovp->nval != FATTR4_TIME_MODIFY) || (*errorp = nfs4_time_vton(&vap->va_mtime, &nap->time_modify))) { @@ -125,7 +125,7 @@ nfs4_ver_fattr4_attr(vattr_t *vap, struct nfs4_ntov_map *ntovp, retval = FALSE; } break; - case AT_CTIME: + case VATTR_CTIME: if (*errorp = nfs4_time_vton(&vap->va_ctime, &nap->time_metadata)) { /* @@ -166,13 +166,13 @@ nfs4_set_fattr4_attr(vattr_t *vap, vsecattr_t *vsap, * Bit matches the mask */ switch (ntovp->vbit & vap->va_mask) { - case AT_SIZE: + case VATTR_SIZE: nap->size = vap->va_size; break; - case AT_MODE: + case VATTR_MODE: nap->mode = vap->va_mode; break; - case AT_UID: + case VATTR_UID: /* * if no mapping, uid will be mapped to a number string, * e.g. "12345" @@ -181,7 +181,7 @@ nfs4_set_fattr4_attr(vattr_t *vap, vsecattr_t *vsap, FALSE)) retval = FALSE; break; - case AT_GID: + case VATTR_GID: /* * if no mapping, gid will be mapped to a number string, * e.g. "12345" @@ -190,7 +190,7 @@ nfs4_set_fattr4_attr(vattr_t *vap, vsecattr_t *vsap, FALSE)) retval = FALSE; break; - case AT_ATIME: + case VATTR_ATIME: if ((ntovp->nval != FATTR4_TIME_ACCESS_SET) || (*errorp = timestruc_to_settime4(&vap->va_atime, &nap->time_access_set, flags))) { @@ -198,7 +198,7 @@ nfs4_set_fattr4_attr(vattr_t *vap, vsecattr_t *vsap, retval = FALSE; } break; - case AT_MTIME: + case VATTR_MTIME: if ((ntovp->nval != FATTR4_TIME_MODIFY_SET) || (*errorp = timestruc_to_settime4(&vap->va_mtime, &nap->time_modify_set, flags))) { @@ -343,17 +343,17 @@ vattr_to_fattr4(vattr_t *vap, vsecattr_t *vsap, fattr4 *fattrp, int flags, } else { /* * The only zero xdr_sizes we should see - * are AT_UID, AT_GID and FATTR4_ACL_MASK + * are VATTR_UID, VATTR_GID and FATTR4_ACL_MASK */ - ASSERT(nfs4_ntov_map[i].vbit == AT_UID || - nfs4_ntov_map[i].vbit == AT_GID || + ASSERT(nfs4_ntov_map[i].vbit == VATTR_UID || + nfs4_ntov_map[i].vbit == VATTR_GID || nfs4_ntov_map[i].fbit == FATTR4_ACL_MASK); - if (nfs4_ntov_map[i].vbit == AT_UID) { + if (nfs4_ntov_map[i].vbit == VATTR_UID) { uid_attr = attrcnt; xdr_size += BYTES_PER_XDR_UNIT; /* length */ xdr_size += RNDUP(na[attrcnt].owner.utf8string_len); - } else if (nfs4_ntov_map[i].vbit == AT_GID) { + } else if (nfs4_ntov_map[i].vbit == VATTR_GID) { gid_attr = attrcnt; xdr_size += BYTES_PER_XDR_UNIT; /* length */ xdr_size += @@ -461,7 +461,7 @@ nfs4_fattr4_free(fattr4 *attrp) void nfs4_vmask_to_nmask(uint_t vmask, bitmap4 *bitsval) { - if (vmask == AT_ALL || vmask == NFS4_VTON_ATTR_MASK) { + if (vmask == VATTR_ALL || vmask == NFS4_VTON_ATTR_MASK) { *bitsval |= NFS4_NTOV_ATTR_MASK; return; } @@ -471,33 +471,33 @@ nfs4_vmask_to_nmask(uint_t vmask, bitmap4 *bitsval) return; } - if (vmask & AT_TYPE) + if (vmask & VATTR_TYPE) *bitsval |= FATTR4_TYPE_MASK; - if (vmask & AT_MODE) + if (vmask & VATTR_MODE) *bitsval |= FATTR4_MODE_MASK; - if (vmask & AT_UID) + if (vmask & VATTR_UID) *bitsval |= FATTR4_OWNER_MASK; - if (vmask & AT_GID) + if (vmask & VATTR_GID) *bitsval |= FATTR4_OWNER_GROUP_MASK; - if (vmask & AT_FSID) + if (vmask & VATTR_FSID) *bitsval |= FATTR4_FSID_MASK; - /* set mounted_on_fileid when AT_NODEID requested */ - if (vmask & AT_NODEID) + /* set mounted_on_fileid when VATTR_NODEID requested */ + if (vmask & VATTR_NODEID) *bitsval |= FATTR4_FILEID_MASK | FATTR4_MOUNTED_ON_FILEID_MASK; - if (vmask & AT_NLINK) + if (vmask & VATTR_NLINK) *bitsval |= FATTR4_NUMLINKS_MASK; - if (vmask & AT_SIZE) + if (vmask & VATTR_SIZE) *bitsval |= FATTR4_SIZE_MASK; - if (vmask & AT_ATIME) + if (vmask & VATTR_ATIME) *bitsval |= FATTR4_TIME_ACCESS_MASK; - if (vmask & AT_MTIME) + if (vmask & VATTR_MTIME) *bitsval |= FATTR4_TIME_MODIFY_MASK; - /* also set CHANGE whenever AT_CTIME requested */ - if (vmask & AT_CTIME) + /* also set CHANGE whenever VATTR_CTIME requested */ + if (vmask & VATTR_CTIME) *bitsval |= FATTR4_TIME_METADATA_MASK | FATTR4_CHANGE_MASK; - if (vmask & AT_NBLOCKS) + if (vmask & VATTR_NBLOCKS) *bitsval |= FATTR4_SPACE_USED_MASK; - if (vmask & AT_RDEV) + if (vmask & VATTR_RDEV) *bitsval |= FATTR4_RAWDEV_MASK; } @@ -514,17 +514,17 @@ nfs4_vmask_to_nmask_set(uint_t vmask, bitmap4 *bitsval) return; } - if (vmask & AT_MODE) + if (vmask & VATTR_MODE) *bitsval |= FATTR4_MODE_MASK; - if (vmask & AT_UID) + if (vmask & VATTR_UID) *bitsval |= FATTR4_OWNER_MASK; - if (vmask & AT_GID) + if (vmask & VATTR_GID) *bitsval |= FATTR4_OWNER_GROUP_MASK; - if (vmask & AT_SIZE) + if (vmask & VATTR_SIZE) *bitsval |= FATTR4_SIZE_MASK; - if (vmask & AT_ATIME) + if (vmask & VATTR_ATIME) *bitsval |= FATTR4_TIME_ACCESS_SET_MASK; - if (vmask & AT_MTIME) + if (vmask & VATTR_MTIME) *bitsval |= FATTR4_TIME_MODIFY_SET_MASK; } @@ -547,7 +547,7 @@ struct nfs4_ntov_map nfs4_ntov_map[] = { FATTR4_SUPPORTED_ATTRS, 2 * BYTES_PER_XDR_UNIT, xdr_bitmap4, NULL, "fattr4_supported_attrs" }, - { FATTR4_TYPE_MASK, AT_TYPE, FALSE, TRUE, + { FATTR4_TYPE_MASK, VATTR_TYPE, FALSE, TRUE, FATTR4_TYPE, BYTES_PER_XDR_UNIT, xdr_int, NULL, "fattr4_type" }, @@ -559,7 +559,7 @@ struct nfs4_ntov_map nfs4_ntov_map[] = { FATTR4_CHANGE, 2 * BYTES_PER_XDR_UNIT, xdr_u_longlong_t, NULL, "fattr4_change" }, - { FATTR4_SIZE_MASK, AT_SIZE, FALSE, TRUE, + { FATTR4_SIZE_MASK, VATTR_SIZE, FALSE, TRUE, FATTR4_SIZE, 2 * BYTES_PER_XDR_UNIT, xdr_u_longlong_t, NULL, "fattr4_size" }, @@ -575,7 +575,7 @@ struct nfs4_ntov_map nfs4_ntov_map[] = { FATTR4_NAMED_ATTR, BYTES_PER_XDR_UNIT, xdr_bool, NULL, "fattr4_named_attr" }, - { FATTR4_FSID_MASK, AT_FSID, FALSE, TRUE, + { FATTR4_FSID_MASK, VATTR_FSID, FALSE, TRUE, FATTR4_FSID, 4 * BYTES_PER_XDR_UNIT, xdr_fattr4_fsid, NULL, "fattr4_fsid" }, @@ -623,7 +623,7 @@ struct nfs4_ntov_map nfs4_ntov_map[] = { FATTR4_FILEHANDLE, 0, xdr_nfs_fh4, NULL, "fattr4_filehandle" }, - { FATTR4_FILEID_MASK, AT_NODEID, FALSE, FALSE, + { FATTR4_FILEID_MASK, VATTR_NODEID, FALSE, FALSE, FATTR4_FILEID, 2 * BYTES_PER_XDR_UNIT, xdr_u_longlong_t, NULL, "fattr4_fileid" }, @@ -675,7 +675,7 @@ struct nfs4_ntov_map nfs4_ntov_map[] = { FATTR4_MIMETYPE, 0, xdr_utf8string, NULL, "fattr4_mimetype" }, - { FATTR4_MODE_MASK, AT_MODE, FALSE, FALSE, + { FATTR4_MODE_MASK, VATTR_MODE, FALSE, FALSE, FATTR4_MODE, BYTES_PER_XDR_UNIT, xdr_u_int, NULL, "fattr4_mode" }, @@ -683,15 +683,15 @@ struct nfs4_ntov_map nfs4_ntov_map[] = { FATTR4_NO_TRUNC, BYTES_PER_XDR_UNIT, xdr_bool, NULL, "fattr4_no_trunc" }, - { FATTR4_NUMLINKS_MASK, AT_NLINK, FALSE, FALSE, + { FATTR4_NUMLINKS_MASK, VATTR_NLINK, FALSE, FALSE, FATTR4_NUMLINKS, BYTES_PER_XDR_UNIT, xdr_u_int, NULL, "fattr4_numlinks" }, - { FATTR4_OWNER_MASK, AT_UID, FALSE, FALSE, + { FATTR4_OWNER_MASK, VATTR_UID, FALSE, FALSE, FATTR4_OWNER, 0, xdr_utf8string, NULL, "fattr4_owner" }, - { FATTR4_OWNER_GROUP_MASK, AT_GID, FALSE, FALSE, + { FATTR4_OWNER_GROUP_MASK, VATTR_GID, FALSE, FALSE, FATTR4_OWNER_GROUP, 0, xdr_utf8string, NULL, "fattr4_owner_group" }, @@ -709,7 +709,7 @@ struct nfs4_ntov_map nfs4_ntov_map[] = { FATTR4_QUOTA_USED, 2 * BYTES_PER_XDR_UNIT, xdr_u_longlong_t, NULL, "fattr4_quota_used" }, - { FATTR4_RAWDEV_MASK, AT_RDEV, FALSE, FALSE, + { FATTR4_RAWDEV_MASK, VATTR_RDEV, FALSE, FALSE, FATTR4_RAWDEV, 2 * BYTES_PER_XDR_UNIT, xdr_fattr4_rawdev, NULL, "fattr4_rawdev" }, @@ -725,7 +725,7 @@ struct nfs4_ntov_map nfs4_ntov_map[] = { FATTR4_SPACE_TOTAL, 2 * BYTES_PER_XDR_UNIT, xdr_u_longlong_t, NULL, "fattr4_space_total" }, - { FATTR4_SPACE_USED_MASK, AT_NBLOCKS, FALSE, FALSE, + { FATTR4_SPACE_USED_MASK, VATTR_NBLOCKS, FALSE, FALSE, FATTR4_SPACE_USED, 2 * BYTES_PER_XDR_UNIT, xdr_u_longlong_t, NULL, "fattr4_space_used" }, @@ -733,11 +733,11 @@ struct nfs4_ntov_map nfs4_ntov_map[] = { FATTR4_SYSTEM, BYTES_PER_XDR_UNIT, xdr_bool, NULL, "fattr4_system" }, - { FATTR4_TIME_ACCESS_MASK, AT_ATIME, FALSE, FALSE, + { FATTR4_TIME_ACCESS_MASK, VATTR_ATIME, FALSE, FALSE, FATTR4_TIME_ACCESS, 3 * BYTES_PER_XDR_UNIT, xdr_nfstime4, NULL, "fattr4_time_access" }, - { FATTR4_TIME_ACCESS_SET_MASK, AT_ATIME, FALSE, FALSE, + { FATTR4_TIME_ACCESS_SET_MASK, VATTR_ATIME, FALSE, FALSE, FATTR4_TIME_ACCESS_SET, 4 * BYTES_PER_XDR_UNIT, xdr_settime4, NULL, "fattr4_time_access_set" }, @@ -753,19 +753,19 @@ struct nfs4_ntov_map nfs4_ntov_map[] = { FATTR4_TIME_DELTA, 3 * BYTES_PER_XDR_UNIT, xdr_nfstime4, NULL, "fattr4_time_delta" }, - { FATTR4_TIME_METADATA_MASK, AT_CTIME, FALSE, FALSE, + { FATTR4_TIME_METADATA_MASK, VATTR_CTIME, FALSE, FALSE, FATTR4_TIME_METADATA, 3 * BYTES_PER_XDR_UNIT, xdr_nfstime4, NULL, "fattr4_time_metadata" }, - { FATTR4_TIME_MODIFY_MASK, AT_MTIME, FALSE, FALSE, + { FATTR4_TIME_MODIFY_MASK, VATTR_MTIME, FALSE, FALSE, FATTR4_TIME_MODIFY, 3 * BYTES_PER_XDR_UNIT, xdr_nfstime4, NULL, "fattr4_time_modify" }, - { FATTR4_TIME_MODIFY_SET_MASK, AT_MTIME, FALSE, FALSE, + { FATTR4_TIME_MODIFY_SET_MASK, VATTR_MTIME, FALSE, FALSE, FATTR4_TIME_MODIFY_SET, 4 * BYTES_PER_XDR_UNIT, xdr_settime4, NULL, "fattr4_time_modify_set" }, - { FATTR4_MOUNTED_ON_FILEID_MASK, AT_NODEID, FALSE, FALSE, + { FATTR4_MOUNTED_ON_FILEID_MASK, VATTR_NODEID, FALSE, FALSE, FATTR4_MOUNTED_ON_FILEID, 2 * BYTES_PER_XDR_UNIT, xdr_u_longlong_t, NULL, "fattr4_mounted_on_fileid" }, diff --git a/kernel/fs/nfs/nfs4_client.c b/kernel/fs/nfs/nfs4_client.c index 0c72fe23b4..27ab6f041d 100644 --- a/kernel/fs/nfs/nfs4_client.c +++ b/kernel/fs/nfs/nfs4_client.c @@ -688,7 +688,7 @@ nfs4_attrcache_va(vnode_t *vp, nfs4_ga_res_t *garp, int set_cache_timeout) rp = VTOR4(vp); ASSERT(MUTEX_HELD(&rp->r_statelock)); - ASSERT(vap->va_mask == AT_ALL); + ASSERT(vap->va_mask == VATTR_ALL); /* Switch to master before checking v_flag */ if (IS_SHADOW(vp, rp)) @@ -908,7 +908,7 @@ nfs4_getattr_otw_norecovery(vnode_t *vp, nfs4_ga_res_t *garp, * to be there. This can lead to anything from system crashes to * corrupted information processed by user apps. * So to ensure that all bases are covered, request at least - * the AT_ALL attribute mask. + * the VATTR_ALL attribute mask. */ argop[1].argop = OP_GETATTR; argop[1].nfs_argop4_u.opgetattr.attr_request = NFS4_VATTR_MASK; diff --git a/kernel/fs/nfs/nfs4_client_state.c b/kernel/fs/nfs/nfs4_client_state.c index 8b082582d6..8af4bf0c05 100644 --- a/kernel/fs/nfs/nfs4_client_state.c +++ b/kernel/fs/nfs/nfs4_client_state.c @@ -2264,8 +2264,8 @@ nfs4_resend_open_otw(vnode_t **vpp, nfs4_lost_rqst_t *resend_rqstp, * just assume every thing is ok for now. */ if (!ep->error && - garp->n4g_va.va_mask & AT_NODEID && - rp->r_attr.va_mask & AT_NODEID && + garp->n4g_va.va_mask & VATTR_NODEID && + rp->r_attr.va_mask & VATTR_NODEID && rp->r_attr.va_nodeid != garp->n4g_va.va_nodeid) { /* diff --git a/kernel/fs/nfs/nfs4_deleg_ops.c b/kernel/fs/nfs/nfs4_deleg_ops.c index ed1a4395c7..e6aebda983 100644 --- a/kernel/fs/nfs/nfs4_deleg_ops.c +++ b/kernel/fs/nfs/nfs4_deleg_ops.c @@ -217,7 +217,7 @@ deleg_rd_setattr(femarg_t *arg, vattr_t *vap, int flags, cred_t *cr, bool_t trunc = FALSE; rfs4_file_t *fp; - if ((vap->va_mask & AT_SIZE) && (vap->va_size == 0)) + if ((vap->va_mask & VATTR_SIZE) && (vap->va_size == 0)) trunc = TRUE; fp = (rfs4_file_t *)arg->fa_fnode->fn_available; @@ -241,7 +241,7 @@ deleg_wr_setattr(femarg_t *arg, vattr_t *vap, int flags, cred_t *cr, * Use caller context to compare caller to delegation owner */ if (ct == NULL || (ct->cc_caller_id != nfs4_srv_caller_id)) { - if ((vap->va_mask & AT_SIZE) && (vap->va_size == 0)) + if ((vap->va_mask & VATTR_SIZE) && (vap->va_size == 0)) trunc = TRUE; fp = (rfs4_file_t *)arg->fa_fnode->fn_available; diff --git a/kernel/fs/nfs/nfs4_rnode.c b/kernel/fs/nfs/nfs4_rnode.c index f2375bab27..7e6c7f70d6 100644 --- a/kernel/fs/nfs/nfs4_rnode.c +++ b/kernel/fs/nfs/nfs4_rnode.c @@ -418,7 +418,7 @@ r4_do_attrcache(vnode_t *vp, nfs4_ga_res_t *garp, int newnode, r4_stub_none(rp); /* Can not cache partial attr */ - if (attr->va_mask == AT_ALL) + if (attr->va_mask == VATTR_ALL) nfs4_attrcache_noinval(vp, garp, t); else PURGE_ATTRCACHE4(vp); diff --git a/kernel/fs/nfs/nfs4_srv.c b/kernel/fs/nfs/nfs4_srv.c index 19428270f6..d3faae8b7c 100644 --- a/kernel/fs/nfs/nfs4_srv.c +++ b/kernel/fs/nfs/nfs4_srv.c @@ -1262,7 +1262,7 @@ rfs4_op_access(nfs_argop4 *argop, nfs_resop4 *resop, struct svc_req *req, * mandatory lock files is denied on the server, so it might * as well be reflected to the server during the open. */ - va.va_mask = AT_MODE; + va.va_mask = VATTR_MODE; error = fop_getattr(vp, &va, 0, cr, NULL); if (error) { *cs->statusp = resp->status = puterrno4(error); @@ -1342,7 +1342,7 @@ rfs4_op_commit(nfs_argop4 *argop, nfs_resop4 *resop, struct svc_req *req, goto out; } - va.va_mask = AT_UID; + va.va_mask = VATTR_UID; error = fop_getattr(vp, &va, 0, cr, NULL); /* @@ -1416,7 +1416,7 @@ do_rfs4_op_mknod(CREATE4args *args, CREATE4res *resp, struct svc_req *req, vap->va_type = VBLK; vap->va_rdev = makedevice(args->ftype4_u.devdata.specdata1, args->ftype4_u.devdata.specdata2); - vap->va_mask |= AT_RDEV; + vap->va_mask |= VATTR_RDEV; break; case NF4SOCK: vap->va_type = VSOCK; @@ -1432,7 +1432,7 @@ do_rfs4_op_mknod(CREATE4args *args, CREATE4res *resp, struct svc_req *req, /* * Must specify the mode. */ - if (!(vap->va_mask & AT_MODE)) { + if (!(vap->va_mask & VATTR_MODE)) { *cs->statusp = resp->status = NFS4ERR_INVAL; return (NULL); } @@ -1577,7 +1577,7 @@ rfs4_op_create(nfs_argop4 *argop, nfs_resop4 *resop, struct svc_req *req, } /* Get "before" change value */ - bva.va_mask = AT_CTIME|AT_SEQ|AT_MODE; + bva.va_mask = VATTR_CTIME|VATTR_SEQ|VATTR_MODE; error = fop_getattr(dvp, &bva, 0, cr, NULL); if (error) { *cs->statusp = resp->status = puterrno4(error); @@ -1597,22 +1597,22 @@ rfs4_op_create(nfs_argop4 *argop, nfs_resop4 *resop, struct svc_req *req, * directory does not have the VSUID/VSGID bit set and they have * not been specified in createattrs. */ - if (!(bva.va_mode & VSUID) && (vap->va_mask & AT_UID) == 0) { + if (!(bva.va_mode & VSUID) && (vap->va_mask & VATTR_UID) == 0) { vap->va_uid = crgetuid(cr); - vap->va_mask |= AT_UID; + vap->va_mask |= VATTR_UID; } - if (!(bva.va_mode & VSGID) && (vap->va_mask & AT_GID) == 0) { + if (!(bva.va_mode & VSGID) && (vap->va_mask & VATTR_GID) == 0) { vap->va_gid = crgetgid(cr); - vap->va_mask |= AT_GID; + vap->va_mask |= VATTR_GID; } - vap->va_mask |= AT_TYPE; + vap->va_mask |= VATTR_TYPE; switch (args->type) { case NF4DIR: vap->va_type = VDIR; - if ((vap->va_mask & AT_MODE) == 0) { + if ((vap->va_mask & VATTR_MODE) == 0) { vap->va_mode = 0700; /* default: owner rwx only */ - vap->va_mask |= AT_MODE; + vap->va_mask |= VATTR_MODE; } error = fop_mkdir(dvp, name, vap, &vp, cr, NULL, 0, NULL); if (error) @@ -1622,15 +1622,15 @@ rfs4_op_create(nfs_argop4 *argop, nfs_resop4 *resop, struct svc_req *req, * Get the initial "after" sequence number, if it fails, * set to zero */ - iva.va_mask = AT_SEQ; + iva.va_mask = VATTR_SEQ; if (fop_getattr(dvp, &iva, 0, cs->cr, NULL)) iva.va_seq = 0; break; case NF4LNK: vap->va_type = VLNK; - if ((vap->va_mask & AT_MODE) == 0) { + if ((vap->va_mask & VATTR_MODE) == 0) { vap->va_mode = 0700; /* default: owner rwx only */ - vap->va_mask |= AT_MODE; + vap->va_mask |= VATTR_MODE; } /* @@ -1685,7 +1685,7 @@ rfs4_op_create(nfs_argop4 *argop, nfs_resop4 *resop, struct svc_req *req, * Get the initial "after" sequence number, if it fails, * set to zero */ - iva.va_mask = AT_SEQ; + iva.va_mask = VATTR_SEQ; if (fop_getattr(dvp, &iva, 0, cs->cr, NULL)) iva.va_seq = 0; @@ -1698,7 +1698,7 @@ rfs4_op_create(nfs_argop4 *argop, nfs_resop4 *resop, struct svc_req *req, * va_seq is not safe over VOP calls, check it again * if it has changed zero out iva to force atomic = FALSE. */ - iva2.va_mask = AT_SEQ; + iva2.va_mask = VATTR_SEQ; if (fop_getattr(dvp, &iva2, 0, cs->cr, NULL) || iva2.va_seq != iva.va_seq) iva.va_seq = 0; @@ -1707,9 +1707,9 @@ rfs4_op_create(nfs_argop4 *argop, nfs_resop4 *resop, struct svc_req *req, /* * probably a special file. */ - if ((vap->va_mask & AT_MODE) == 0) { + if ((vap->va_mask & VATTR_MODE) == 0) { vap->va_mode = 0600; /* default: owner rw only */ - vap->va_mask |= AT_MODE; + vap->va_mask |= VATTR_MODE; } syncval = FNODSYNC; /* @@ -1730,7 +1730,7 @@ rfs4_op_create(nfs_argop4 *argop, nfs_resop4 *resop, struct svc_req *req, * Get the initial "after" sequence number, if it fails, * set to zero */ - iva.va_mask = AT_SEQ; + iva.va_mask = VATTR_SEQ; if (fop_getattr(dvp, &iva, 0, cs->cr, NULL)) iva.va_seq = 0; @@ -1762,7 +1762,7 @@ rfs4_op_create(nfs_argop4 *argop, nfs_resop4 *resop, struct svc_req *req, * Get "after" change value, if it fails, simply return the * before value. */ - ava.va_mask = AT_CTIME|AT_SEQ; + ava.va_mask = VATTR_CTIME|VATTR_SEQ; if (fop_getattr(dvp, &ava, 0, cr, NULL)) { ava.va_ctime = bva.va_ctime; ava.va_seq = 0; @@ -2471,7 +2471,7 @@ rfs4_op_link(nfs_argop4 *argop, nfs_resop4 *resop, struct svc_req *req, } /* Get "before" change value */ - bdva.va_mask = AT_CTIME|AT_SEQ; + bdva.va_mask = VATTR_CTIME|VATTR_SEQ; error = fop_getattr(dvp, &bdva, 0, cs->cr, NULL); if (error) { *cs->statusp = resp->status = puterrno4(error); @@ -2500,7 +2500,7 @@ rfs4_op_link(nfs_argop4 *argop, nfs_resop4 *resop, struct svc_req *req, /* * Get the initial "after" sequence number, if it fails, set to zero */ - idva.va_mask = AT_SEQ; + idva.va_mask = VATTR_SEQ; if (fop_getattr(dvp, &idva, 0, cs->cr, NULL)) idva.va_seq = 0; @@ -2519,7 +2519,7 @@ rfs4_op_link(nfs_argop4 *argop, nfs_resop4 *resop, struct svc_req *req, * Get "after" change value, if it fails, simply return the * before value. */ - adva.va_mask = AT_CTIME|AT_SEQ; + adva.va_mask = VATTR_CTIME|VATTR_SEQ; if (fop_getattr(dvp, &adva, 0, cs->cr, NULL)) { adva.va_ctime = bdva.va_ctime; adva.va_seq = 0; @@ -3083,7 +3083,7 @@ rfs4_op_read(nfs_argop4 *argop, nfs_resop4 *resop, struct svc_req *req, /* use loaned buffers for TCP */ loaned_buffers = (nfs_loaned_buffers && !rdma_used) ? 1 : 0; - va.va_mask = AT_MODE|AT_SIZE|AT_UID; + va.va_mask = VATTR_MODE|VATTR_SIZE|VATTR_UID; verror = fop_getattr(vp, &va, 0, cs->cr, &ct); /* @@ -3207,7 +3207,7 @@ rfs4_op_read(nfs_argop4 *argop, nfs_resop4 *resop, struct svc_req *req, doio_read: error = do_io(FREAD, vp, uiop, 0, cs->cr, &ct); - va.va_mask = AT_SIZE; + va.va_mask = VATTR_SIZE; verror = fop_getattr(vp, &va, 0, cs->cr, &ct); if (error) { @@ -3585,7 +3585,7 @@ set_rdattr_params(struct nfs4_svgetit_arg *sargp, /* * At least get fileid for regular readdir output */ - sargp->vap->va_mask &= AT_NODEID; + sargp->vap->va_mask &= VATTR_NODEID; status = NFS4_OK; } @@ -3648,7 +3648,7 @@ rfs4_op_readlink(nfs_argop4 *argop, nfs_resop4 *resop, struct svc_req *req, } - va.va_mask = AT_MODE; + va.va_mask = VATTR_MODE; error = fop_getattr(vp, &va, 0, cs->cr, NULL); if (error) { *cs->statusp = resp->status = puterrno4(error); @@ -4055,7 +4055,7 @@ rfs4_op_remove(nfs_argop4 *argop, nfs_resop4 *resop, struct svc_req *req, } /* Get dir "before" change value */ - bdva.va_mask = AT_CTIME|AT_SEQ; + bdva.va_mask = VATTR_CTIME|VATTR_SEQ; error = fop_getattr(dvp, &bdva, 0, cs->cr, NULL); if (error) { *cs->statusp = resp->status = puterrno4(error); @@ -4109,7 +4109,7 @@ rfs4_op_remove(nfs_argop4 *argop, nfs_resop4 *resop, struct svc_req *req, * This is va_seq safe because we are not * manipulating dvp. */ - va.va_mask = AT_NLINK; + va.va_mask = VATTR_NLINK; if (!fop_getattr(tvp, &va, 0, cs->cr, NULL) && va.va_nlink == 0) { /* Remove state on file remove */ @@ -4144,7 +4144,7 @@ rfs4_op_remove(nfs_argop4 *argop, nfs_resop4 *resop, struct svc_req *req, /* * Get the initial "after" sequence number, if it fails, set to zero */ - idva.va_mask = AT_SEQ; + idva.va_mask = VATTR_SEQ; if (fop_getattr(dvp, &idva, 0, cs->cr, NULL)) idva.va_seq = 0; @@ -4157,7 +4157,7 @@ rfs4_op_remove(nfs_argop4 *argop, nfs_resop4 *resop, struct svc_req *req, * Get "after" change value, if it fails, simply return the * before value. */ - adva.va_mask = AT_CTIME|AT_SEQ; + adva.va_mask = VATTR_CTIME|VATTR_SEQ; if (fop_getattr(dvp, &adva, 0, cs->cr, NULL)) { adva.va_ctime = bdva.va_ctime; adva.va_seq = 0; @@ -4397,10 +4397,10 @@ rfs4_op_rename(nfs_argop4 *argop, nfs_resop4 *resop, struct svc_req *req, } /* Get source "before" change value */ - obdva.va_mask = AT_CTIME|AT_SEQ; + obdva.va_mask = VATTR_CTIME|VATTR_SEQ; error = fop_getattr(odvp, &obdva, 0, cs->cr, NULL); if (!error) { - nbdva.va_mask = AT_CTIME|AT_SEQ; + nbdva.va_mask = VATTR_CTIME|VATTR_SEQ; error = fop_getattr(ndvp, &nbdva, 0, cs->cr, NULL); } if (error) { @@ -4423,7 +4423,7 @@ rfs4_op_rename(nfs_argop4 *argop, nfs_resop4 *resop, struct svc_req *req, rfs4_dbe_unlock(fp->rf_dbe); if (tvp) { - va.va_mask = AT_NLINK; + va.va_mask = VATTR_NLINK; if (!fop_getattr(tvp, &va, 0, cs->cr, NULL) && va.va_nlink == 0) { /* The file is gone and so should the state */ @@ -4467,11 +4467,11 @@ rfs4_op_rename(nfs_argop4 *argop, nfs_resop4 *resop, struct svc_req *req, /* * Get the initial "after" sequence number, if it fails, set to zero */ - oidva.va_mask = AT_SEQ; + oidva.va_mask = VATTR_SEQ; if (fop_getattr(odvp, &oidva, 0, cs->cr, NULL)) oidva.va_seq = 0; - nidva.va_mask = AT_SEQ; + nidva.va_mask = VATTR_SEQ; if (fop_getattr(ndvp, &nidva, 0, cs->cr, NULL)) nidva.va_seq = 0; @@ -4490,13 +4490,13 @@ rfs4_op_rename(nfs_argop4 *argop, nfs_resop4 *resop, struct svc_req *req, * Get "after" change values, if it fails, simply return the * before value. */ - oadva.va_mask = AT_CTIME|AT_SEQ; + oadva.va_mask = VATTR_CTIME|VATTR_SEQ; if (fop_getattr(odvp, &oadva, 0, cs->cr, NULL)) { oadva.va_ctime = obdva.va_ctime; oadva.va_seq = 0; } - nadva.va_mask = AT_CTIME|AT_SEQ; + nadva.va_mask = VATTR_CTIME|VATTR_SEQ; if (fop_getattr(odvp, &nadva, 0, cs->cr, NULL)) { nadva.va_ctime = nbdva.va_ctime; nadva.va_seq = 0; @@ -4994,7 +4994,7 @@ do_rfs4_op_setattr(bitmap4 *resp, fattr4 *fattrp, struct compound_state *cs, (fattrp->attrmask & FATTR4_MODE_MASK)) { vattr_t va; - va.va_mask = AT_MODE; + va.va_mask = VATTR_MODE; error = fop_getattr(vp, &va, 0, cs->cr, NULL); if (error) { status = puterrno4(error); @@ -5008,10 +5008,10 @@ do_rfs4_op_setattr(bitmap4 *resp, fattr4 *fattrp, struct compound_state *cs, } /* Check stateid only if size has been set */ - if (sarg.vap->va_mask & AT_SIZE) { + if (sarg.vap->va_mask & VATTR_SIZE) { trunc = (sarg.vap->va_size == 0); status = rfs4_check_stateid(FWRITE, cs->vp, stateid, - trunc, &cs->deleg, sarg.vap->va_mask & AT_SIZE, &ct); + trunc, &cs->deleg, sarg.vap->va_mask & VATTR_SIZE, &ct); if (status != NFS4_OK) goto done; } else { @@ -5037,15 +5037,15 @@ do_rfs4_op_setattr(bitmap4 *resp, fattr4 *fattrp, struct compound_state *cs, * size if there is a conflicting non-blocking mandatory lock in * the region of the change. */ - if (vp->v_type == VREG && (sarg.vap->va_mask & AT_SIZE)) { + if (vp->v_type == VREG && (sarg.vap->va_mask & VATTR_SIZE)) { uoff_t offset; ssize_t length; /* - * ufs_setattr clears AT_SIZE from vap->va_mask, but + * ufs_setattr clears VATTR_SIZE from vap->va_mask, but * before returning, sarg.vap->va_mask is used to * generate the setattr reply bitmap. We also clear - * AT_SIZE below before calling fop_space. For both + * VATTR_SIZE below before calling fop_space. For both * of these cases, the va_mask needs to be saved here * and restored after calling fop_setattr. */ @@ -5061,7 +5061,7 @@ do_rfs4_op_setattr(bitmap4 *resp, fattr4 *fattrp, struct compound_state *cs, in_crit = 1; } - bva.va_mask = AT_UID|AT_SIZE; + bva.va_mask = VATTR_UID|VATTR_SIZE; if (error = fop_getattr(vp, &bva, 0, cr, &ct)) { status = puterrno4(error); goto done; @@ -5083,7 +5083,7 @@ do_rfs4_op_setattr(bitmap4 *resp, fattr4 *fattrp, struct compound_state *cs, } if (crgetuid(cr) == bva.va_uid) { - sarg.vap->va_mask &= ~AT_SIZE; + sarg.vap->va_mask &= ~VATTR_SIZE; bf.l_type = F_WRLCK; bf.l_whence = 0; bf.l_start = (off64_t)sarg.vap->va_size; @@ -5098,9 +5098,9 @@ do_rfs4_op_setattr(bitmap4 *resp, fattr4 *fattrp, struct compound_state *cs, if (!error && sarg.vap->va_mask != 0) error = fop_setattr(vp, sarg.vap, sarg.flag, cr, &ct); - /* restore va_mask -- ufs_setattr clears AT_SIZE */ - if (saved_mask & AT_SIZE) - sarg.vap->va_mask |= AT_SIZE; + /* restore va_mask -- ufs_setattr clears VATTR_SIZE */ + if (saved_mask & VATTR_SIZE) + sarg.vap->va_mask |= VATTR_SIZE; /* * If an ACL was being set, it has been delayed until now, @@ -5160,7 +5160,7 @@ done: /* * Except for nfs4_vmask_to_nmask_set(), vattr --> fattr * conversion sets both readable and writeable NFS4 attrs - * for AT_MTIME and AT_ATIME. The line below masks out + * for VATTR_MTIME and VATTR_ATIME. The line below masks out * unrequested attrs from the setattr result bitmap. This * is placed after the done: label to catch the ATTRNOTSUP * case. @@ -5401,7 +5401,7 @@ rfs4_op_write(nfs_argop4 *argop, nfs_resop4 *resop, struct svc_req *req, } } - bva.va_mask = AT_MODE | AT_UID; + bva.va_mask = VATTR_MODE | VATTR_UID; error = fop_getattr(vp, &bva, 0, cr, &ct); /* @@ -5900,7 +5900,7 @@ rfs4_lookupfile(component4 *component, struct svc_req *req, int error; /* Get "before" change value */ - bva.va_mask = AT_CTIME|AT_SEQ; + bva.va_mask = VATTR_CTIME|VATTR_SEQ; error = fop_getattr(dvp, &bva, 0, cs->cr, NULL); if (error) return (puterrno4(error)); @@ -5918,7 +5918,7 @@ rfs4_lookupfile(component4 *component, struct svc_req *req, * Get "after" change value, if it fails, simply return the * before value. */ - ava.va_mask = AT_CTIME|AT_SEQ; + ava.va_mask = VATTR_CTIME|VATTR_SEQ; if (fop_getattr(dvp, &ava, 0, cs->cr, NULL)) { ava.va_ctime = bva.va_ctime; ava.va_seq = 0; @@ -5928,7 +5928,7 @@ rfs4_lookupfile(component4 *component, struct svc_req *req, /* * Validate the file is a file */ - fva.va_mask = AT_TYPE|AT_MODE; + fva.va_mask = VATTR_TYPE|VATTR_MODE; error = fop_getattr(cs->vp, &fva, 0, cs->cr, NULL); if (error) return (puterrno4(error)); @@ -6031,7 +6031,7 @@ tryagain: } /* Check for duplicate request */ - va.va_mask = AT_MTIME; + va.va_mask = VATTR_MTIME; error = fop_getattr(*vpp, &va, 0, cr, NULL); if (!error) { /* We found the file */ @@ -6150,7 +6150,7 @@ rfs4_createfile(OPEN4args *args, struct svc_req *req, struct compound_state *cs, return (NFS4ERR_NAMETOOLONG); } - bva.va_mask = AT_TYPE|AT_CTIME|AT_SEQ; + bva.va_mask = VATTR_TYPE|VATTR_CTIME|VATTR_SEQ; error = fop_getattr(dvp, &bva, 0, cs->cr, NULL); if (error) { kmem_free(nm, buflen); @@ -6176,7 +6176,7 @@ rfs4_createfile(OPEN4args *args, struct svc_req *req, struct compound_state *cs, &args->createhow4_u.createattrs, cs, &sarg, &ntov, NFS4ATTR_SETIT); - if (status == NFS4_OK && (sarg.vap->va_mask & AT_TYPE) && + if (status == NFS4_OK && (sarg.vap->va_mask & VATTR_TYPE) && sarg.vap->va_type != VREG) { if (sarg.vap->va_type == VDIR) status = NFS4ERR_ISDIR; @@ -6195,14 +6195,14 @@ rfs4_createfile(OPEN4args *args, struct svc_req *req, struct compound_state *cs, vap = sarg.vap; vap->va_type = VREG; - vap->va_mask |= AT_TYPE; + vap->va_mask |= VATTR_TYPE; - if ((vap->va_mask & AT_MODE) == 0) { - vap->va_mask |= AT_MODE; + if ((vap->va_mask & VATTR_MODE) == 0) { + vap->va_mask |= VATTR_MODE; vap->va_mode = (mode_t)0600; } - if (vap->va_mask & AT_SIZE) { + if (vap->va_mask & VATTR_SIZE) { /* Disallow create with a non-zero size */ @@ -6224,7 +6224,7 @@ rfs4_createfile(OPEN4args *args, struct svc_req *req, struct compound_state *cs, return (NFS4ERR_INVAL); } - cva.va_mask = AT_TYPE | AT_MTIME | AT_MODE; + cva.va_mask = VATTR_TYPE | VATTR_MTIME | VATTR_MODE; cva.va_type = VREG; /* * Ensure no time overflows. Assumes underlying @@ -6314,7 +6314,7 @@ rfs4_createfile(OPEN4args *args, struct svc_req *req, struct compound_state *cs, * Get the initial "after" sequence number, if it fails, * set to zero, time to before. */ - iva.va_mask = AT_CTIME|AT_SEQ; + iva.va_mask = VATTR_CTIME|VATTR_SEQ; if (fop_getattr(dvp, &iva, 0, cs->cr, NULL)) { iva.va_seq = 0; iva.va_ctime = bva.va_ctime; @@ -6345,7 +6345,7 @@ rfs4_createfile(OPEN4args *args, struct svc_req *req, struct compound_state *cs, * Get "after" change value, if it fails, simply return the * before value. */ - ava.va_mask = AT_CTIME|AT_SEQ; + ava.va_mask = VATTR_CTIME|VATTR_SEQ; if (fop_getattr(dvp, &ava, 0, cs->cr, NULL)) { ava.va_ctime = bva.va_ctime; ava.va_seq = 0; @@ -6367,9 +6367,9 @@ rfs4_createfile(OPEN4args *args, struct svc_req *req, struct compound_state *cs, } /* Check for mandatory locking and that the size gets set. */ - cva.va_mask = AT_MODE; + cva.va_mask = VATTR_MODE; if (setsize) - cva.va_mask |= AT_SIZE; + cva.va_mask |= VATTR_SIZE; /* Assume the worst */ cs->mandlock = TRUE; @@ -6425,7 +6425,7 @@ rfs4_createfile(OPEN4args *args, struct svc_req *req, struct compound_state *cs, ct.cc_caller_id = nfs4_srv_caller_id; ct.cc_flags = CC_DONTBLOCK; - cva.va_mask = AT_SIZE; + cva.va_mask = VATTR_SIZE; cva.va_size = reqsize; (void) fop_setattr(vp, &cva, 0, cs->cr, &ct); if (in_crit) @@ -6774,7 +6774,7 @@ rfs4_do_openprev(struct compound_state *cs, struct svc_req *req, return; } - va.va_mask = AT_MODE|AT_UID; + va.va_mask = VATTR_MODE|VATTR_UID; error = fop_getattr(cs->vp, &va, 0, cs->cr, NULL); if (error) { resp->status = puterrno4(error); diff --git a/kernel/fs/nfs/nfs4_srv_attr.c b/kernel/fs/nfs/nfs4_srv_attr.c index 75131809f3..1b9980e37d 100644 --- a/kernel/fs/nfs/nfs4_srv_attr.c +++ b/kernel/fs/nfs/nfs4_srv_attr.c @@ -142,7 +142,7 @@ rfs4_attr_init() */ sarg.op = NFS4ATTR_SUPPORTED; sarg.cs = &cs; - sarg.vap->va_mask = AT_ALL; + sarg.vap->va_mask = VATTR_ALL; sarg.sbp = &sb; sarg.flag = 0; sarg.rdattr_error = NFS4_OK; @@ -261,11 +261,11 @@ rfs4_fattr4_type(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg, error = EINVAL; break; /* this attr is supported */ case NFS4ATTR_GETIT: - if (sarg->rdattr_error && !(sarg->vap->va_mask & AT_TYPE)) { + if (sarg->rdattr_error && !(sarg->vap->va_mask & VATTR_TYPE)) { error = -1; /* may be okay if rdattr_error */ break; } - ASSERT(sarg->vap->va_mask & AT_TYPE); + ASSERT(sarg->vap->va_mask & VATTR_TYPE); /* * if xattr flag not set, use v4_to_nf4 mapping; @@ -295,7 +295,7 @@ rfs4_fattr4_type(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg, /* * Compare the input type to the object type on server */ - ASSERT(sarg->vap->va_mask & AT_TYPE); + ASSERT(sarg->vap->va_mask & VATTR_TYPE); if (sarg->vap->va_type != nf4_to_vt[na->type]) error = -1; /* no match */ break; @@ -398,13 +398,13 @@ fattr4_get_change(struct nfs4_svgetit_arg *sarg, fattr4_change *changep) nfsstat4 status; timespec_t vis_change; - if ((vap->va_mask & AT_CTIME) == 0) { + if ((vap->va_mask & VATTR_CTIME) == 0) { if (sarg->rdattr_error && (vp == NULL)) { return (-1); /* may be okay if rdattr_error */ } ASSERT(vp != NULL); vap = vap2; - vap->va_mask = AT_CTIME; + vap->va_mask = VATTR_CTIME; status = rfs4_vop_getattr(vp, vap, 0, cs->cr); if (status != NFS4_OK) return (geterrno4(status)); @@ -447,7 +447,7 @@ rfs4_fattr4_change(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg, break; case NFS4ATTR_VERIT: mask = vap->va_mask; - vap->va_mask &= ~AT_CTIME; /* force a fop_getattr */ + vap->va_mask &= ~VATTR_CTIME; /* force a fop_getattr */ error = fattr4_get_change(sarg, &change); vap->va_mask = mask; if (!error && (na->change != change)) @@ -470,19 +470,19 @@ rfs4_fattr4_size(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg, case NFS4ATTR_SUPPORTED: break; /* this attr is supported */ case NFS4ATTR_GETIT: - if (sarg->rdattr_error && !(sarg->vap->va_mask & AT_SIZE)) { + if (sarg->rdattr_error && !(sarg->vap->va_mask & VATTR_SIZE)) { error = -1; /* may be okay if rdattr_error */ break; } - ASSERT(sarg->vap->va_mask & AT_SIZE); + ASSERT(sarg->vap->va_mask & VATTR_SIZE); na->size = sarg->vap->va_size; break; case NFS4ATTR_SETIT: - ASSERT(sarg->vap->va_mask & AT_SIZE); + ASSERT(sarg->vap->va_mask & VATTR_SIZE); sarg->vap->va_size = na->size; break; case NFS4ATTR_VERIT: - ASSERT(sarg->vap->va_mask & AT_SIZE); + ASSERT(sarg->vap->va_mask & VATTR_SIZE); if (sarg->vap->va_size != na->size) error = -1; /* no match */ break; @@ -977,10 +977,10 @@ rfs4_fattr4_acl(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg, vs_ace4.vsa_aclentp = na->acl.fattr4_acl_val; vs_ace4.vsa_aclentsz = vs_ace4.vsa_aclcnt * sizeof (ace_t); /* make sure we have correct owner/group */ - if ((vap->va_mask & (AT_UID | AT_GID)) != - (AT_UID | AT_GID)) { + if ((vap->va_mask & (VATTR_UID | VATTR_GID)) != + (VATTR_UID | VATTR_GID)) { vap = &va; - vap->va_mask = AT_UID | AT_GID; + vap->va_mask = VATTR_UID | VATTR_GID; status = rfs4_vop_getattr(vp, vap, 0, sarg->cs->cr); if (status != NFS4_OK) @@ -1266,11 +1266,11 @@ rfs4_fattr4_fileid(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg, error = EINVAL; break; /* this attr is supported */ case NFS4ATTR_GETIT: - if (sarg->rdattr_error && !(sarg->vap->va_mask & AT_NODEID)) { + if (sarg->rdattr_error && !(sarg->vap->va_mask & VATTR_NODEID)) { error = -1; /* may be okay if rdattr_error */ break; } - ASSERT(sarg->vap->va_mask & AT_NODEID); + ASSERT(sarg->vap->va_mask & VATTR_NODEID); na->fileid = sarg->vap->va_nodeid; break; case NFS4ATTR_SETIT: @@ -1280,7 +1280,7 @@ rfs4_fattr4_fileid(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg, error = EINVAL; break; case NFS4ATTR_VERIT: - ASSERT(sarg->vap->va_mask & AT_NODEID); + ASSERT(sarg->vap->va_mask & VATTR_NODEID); if (sarg->vap->va_nodeid != na->fileid) error = -1; /* no match */ break; @@ -1319,7 +1319,7 @@ rfs4_get_mntdfileid(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg) ASSERT(VN_CMP(vp, rootdir)); vap = sarg->vap; } else { - va.va_mask = AT_NODEID; + va.va_mask = VATTR_NODEID; vap = &va; error = rfs4_vop_getattr(stubvp, vap, 0, sarg->cs->cr); } @@ -1337,13 +1337,13 @@ rfs4_get_mntdfileid(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg) vap = sarg->vap; /* - * At this point, vap should contain "correct" AT_NODEID -- + * At this point, vap should contain "correct" VATTR_NODEID -- * (for V_ROOT case, nodeid of stub, for non-VROOT case, - * nodeid of vp). If error or AT_NODEID not available, then + * nodeid of vp). If error or VATTR_NODEID not available, then * make the obligatory (yet mysterious) rdattr_error * check that is so common in the attr code. */ - if (!error && (vap->va_mask & AT_NODEID)) { + if (!error && (vap->va_mask & VATTR_NODEID)) { sarg->mounted_on_fileid = vap->va_nodeid; sarg->mntdfid_set = TRUE; } else if (sarg->rdattr_error) @@ -1927,15 +1927,15 @@ rfs4_fattr4_mode(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg, case NFS4ATTR_SUPPORTED: break; /* this attr is supported */ case NFS4ATTR_GETIT: - if (sarg->rdattr_error && !(sarg->vap->va_mask & AT_MODE)) { + if (sarg->rdattr_error && !(sarg->vap->va_mask & VATTR_MODE)) { error = -1; /* may be okay if rdattr_error */ break; } - ASSERT(sarg->vap->va_mask & AT_MODE); + ASSERT(sarg->vap->va_mask & VATTR_MODE); na->mode = sarg->vap->va_mode; break; case NFS4ATTR_SETIT: - ASSERT(sarg->vap->va_mask & AT_MODE); + ASSERT(sarg->vap->va_mask & VATTR_MODE); sarg->vap->va_mode = na->mode; /* * If the filesystem is exported with nosuid, then mask off @@ -1946,7 +1946,7 @@ rfs4_fattr4_mode(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg, sarg->vap->va_mode &= ~(VSUID | VSGID); break; case NFS4ATTR_VERIT: - ASSERT(sarg->vap->va_mask & AT_MODE); + ASSERT(sarg->vap->va_mask & VATTR_MODE); if (sarg->vap->va_mode != na->mode) error = -1; /* no match */ break; @@ -2006,11 +2006,11 @@ rfs4_fattr4_numlinks(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg, error = EINVAL; break; /* this attr is supported */ case NFS4ATTR_GETIT: - if (sarg->rdattr_error && !(sarg->vap->va_mask & AT_NLINK)) { + if (sarg->rdattr_error && !(sarg->vap->va_mask & VATTR_NLINK)) { error = -1; /* may be okay if rdattr_error */ break; } - ASSERT(sarg->vap->va_mask & AT_NLINK); + ASSERT(sarg->vap->va_mask & VATTR_NLINK); na->numlinks = sarg->vap->va_nlink; break; case NFS4ATTR_SETIT: @@ -2020,7 +2020,7 @@ rfs4_fattr4_numlinks(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg, error = EINVAL; break; case NFS4ATTR_VERIT: - ASSERT(sarg->vap->va_mask & AT_NLINK); + ASSERT(sarg->vap->va_mask & VATTR_NLINK); if (sarg->vap->va_nlink != na->numlinks) error = -1; /* no match */ break; @@ -2045,11 +2045,11 @@ rfs4_fattr4_owner(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg, case NFS4ATTR_SUPPORTED: break; /* this attr is supported */ case NFS4ATTR_GETIT: - if (sarg->rdattr_error && !(sarg->vap->va_mask & AT_UID)) { + if (sarg->rdattr_error && !(sarg->vap->va_mask & VATTR_UID)) { error = -1; /* may be okay if rdattr_error */ break; } - ASSERT(sarg->vap->va_mask & AT_UID); + ASSERT(sarg->vap->va_mask & VATTR_UID); /* * There are well defined polices for what happens on server- @@ -2067,7 +2067,7 @@ rfs4_fattr4_owner(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg, break; case NFS4ATTR_SETIT: - ASSERT(sarg->vap->va_mask & AT_UID); + ASSERT(sarg->vap->va_mask & VATTR_UID); /* * There are well defined policies for what happens on server- @@ -2118,7 +2118,7 @@ rfs4_fattr4_owner(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg, break; case NFS4ATTR_VERIT: - ASSERT(sarg->vap->va_mask & AT_UID); + ASSERT(sarg->vap->va_mask & VATTR_UID); error = nfs_idmap_str_uid(&na->owner, &uid, TRUE); /* * Ignore warning that we are the nfsmapid (can't happen on srv) @@ -2157,11 +2157,11 @@ rfs4_fattr4_owner_group(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg, case NFS4ATTR_SUPPORTED: break; /* this attr is supported */ case NFS4ATTR_GETIT: - if (sarg->rdattr_error && !(sarg->vap->va_mask & AT_GID)) { + if (sarg->rdattr_error && !(sarg->vap->va_mask & VATTR_GID)) { error = -1; /* may be okay if rdattr_error */ break; } - ASSERT(sarg->vap->va_mask & AT_GID); + ASSERT(sarg->vap->va_mask & VATTR_GID); /* * There are well defined polices for what happens on server- @@ -2180,7 +2180,7 @@ rfs4_fattr4_owner_group(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg, break; case NFS4ATTR_SETIT: - ASSERT(sarg->vap->va_mask & AT_GID); + ASSERT(sarg->vap->va_mask & VATTR_GID); /* * There are well defined policies for what happens on server- @@ -2232,7 +2232,7 @@ rfs4_fattr4_owner_group(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg, break; case NFS4ATTR_VERIT: - ASSERT(sarg->vap->va_mask & AT_GID); + ASSERT(sarg->vap->va_mask & VATTR_GID); error = nfs_idmap_str_gid(&na->owner_group, &gid, TRUE); /* * Ignore warning that we are the nfsmapid (can't happen on srv) @@ -2298,11 +2298,11 @@ rfs4_fattr4_rawdev(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg, error = EINVAL; break; /* this attr is supported */ case NFS4ATTR_GETIT: - if (sarg->rdattr_error && !(sarg->vap->va_mask & AT_RDEV)) { + if (sarg->rdattr_error && !(sarg->vap->va_mask & VATTR_RDEV)) { error = -1; /* may be okay if rdattr_error */ break; } - ASSERT(sarg->vap->va_mask & AT_RDEV); + ASSERT(sarg->vap->va_mask & VATTR_RDEV); na->rawdev.specdata1 = (uint32)getmajor(sarg->vap->va_rdev); na->rawdev.specdata2 = (uint32)getminor(sarg->vap->va_rdev); break; @@ -2313,7 +2313,7 @@ rfs4_fattr4_rawdev(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg, error = EINVAL; break; case NFS4ATTR_VERIT: - ASSERT(sarg->vap->va_mask & AT_RDEV); + ASSERT(sarg->vap->va_mask & VATTR_RDEV); if ((na->rawdev.specdata1 != (uint32)getmajor(sarg->vap->va_rdev)) || (na->rawdev.specdata2 != @@ -2483,11 +2483,11 @@ rfs4_fattr4_space_used(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg, error = EINVAL; break; /* this attr is supported */ case NFS4ATTR_GETIT: - if (sarg->rdattr_error && !(sarg->vap->va_mask & AT_NBLOCKS)) { + if (sarg->rdattr_error && !(sarg->vap->va_mask & VATTR_NBLOCKS)) { error = -1; /* may be okay if rdattr_error */ break; } - ASSERT(sarg->vap->va_mask & AT_NBLOCKS); + ASSERT(sarg->vap->va_mask & VATTR_NBLOCKS); na->space_used = (fattr4_space_used) DEV_BSIZE * (fattr4_space_used) sarg->vap->va_nblocks; break; @@ -2498,7 +2498,7 @@ rfs4_fattr4_space_used(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg, error = EINVAL; break; case NFS4ATTR_VERIT: - ASSERT(sarg->vap->va_mask & AT_NBLOCKS); + ASSERT(sarg->vap->va_mask & VATTR_NBLOCKS); if (sarg->vap->va_nblocks != na->space_used) error = -1; /* no match */ break; @@ -2533,11 +2533,11 @@ rfs4_fattr4_time_access(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg, error = EINVAL; break; /* this attr is supported */ case NFS4ATTR_GETIT: - if (sarg->rdattr_error && !(sarg->vap->va_mask & AT_ATIME)) { + if (sarg->rdattr_error && !(sarg->vap->va_mask & VATTR_ATIME)) { error = -1; /* may be okay if rdattr_error */ break; } - ASSERT(sarg->vap->va_mask & AT_ATIME); + ASSERT(sarg->vap->va_mask & VATTR_ATIME); error = nfs4_time_vton(&sarg->vap->va_atime, &na->time_access); break; case NFS4ATTR_SETIT: @@ -2547,7 +2547,7 @@ rfs4_fattr4_time_access(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg, error = EINVAL; break; case NFS4ATTR_VERIT: - ASSERT(sarg->vap->va_mask & AT_ATIME); + ASSERT(sarg->vap->va_mask & VATTR_ATIME); error = nfs4_time_ntov(&na->time_access, &atime); if (error) break; @@ -2588,7 +2588,7 @@ rfs4_fattr4_time_access_set(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg, error = EINVAL; break; case NFS4ATTR_SETIT: - ASSERT(sarg->vap->va_mask & AT_ATIME); + ASSERT(sarg->vap->va_mask & VATTR_ATIME); /* * Set access time (by server or by client) */ @@ -2676,11 +2676,11 @@ rfs4_fattr4_time_metadata(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg, error = EINVAL; break; /* this attr is supported */ case NFS4ATTR_GETIT: - if (sarg->rdattr_error && !(sarg->vap->va_mask & AT_CTIME)) { + if (sarg->rdattr_error && !(sarg->vap->va_mask & VATTR_CTIME)) { error = -1; /* may be okay if rdattr_error */ break; } - ASSERT(sarg->vap->va_mask & AT_CTIME); + ASSERT(sarg->vap->va_mask & VATTR_CTIME); error = nfs4_time_vton(&sarg->vap->va_ctime, &na->time_metadata); break; @@ -2691,7 +2691,7 @@ rfs4_fattr4_time_metadata(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg, error = EINVAL; break; case NFS4ATTR_VERIT: - ASSERT(sarg->vap->va_mask & AT_CTIME); + ASSERT(sarg->vap->va_mask & VATTR_CTIME); error = nfs4_time_ntov(&na->time_metadata, &ctime); if (error) break; @@ -2721,11 +2721,11 @@ rfs4_fattr4_time_modify(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg, error = EINVAL; break; /* this attr is supported */ case NFS4ATTR_GETIT: - if (sarg->rdattr_error && !(sarg->vap->va_mask & AT_MTIME)) { + if (sarg->rdattr_error && !(sarg->vap->va_mask & VATTR_MTIME)) { error = -1; /* may be okay if rdattr_error */ break; } - ASSERT(sarg->vap->va_mask & AT_MTIME); + ASSERT(sarg->vap->va_mask & VATTR_MTIME); error = nfs4_time_vton(&sarg->vap->va_mtime, &na->time_modify); break; case NFS4ATTR_SETIT: @@ -2735,7 +2735,7 @@ rfs4_fattr4_time_modify(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg, error = EINVAL; break; case NFS4ATTR_VERIT: - ASSERT(sarg->vap->va_mask & AT_MTIME); + ASSERT(sarg->vap->va_mask & VATTR_MTIME); error = nfs4_time_ntov(&na->time_modify, &mtime); if (error) break; @@ -2776,7 +2776,7 @@ rfs4_fattr4_time_modify_set(nfs4_attr_cmd_t cmd, struct nfs4_svgetit_arg *sarg, error = EINVAL; break; case NFS4ATTR_SETIT: - ASSERT(sarg->vap->va_mask & AT_MTIME); + ASSERT(sarg->vap->va_mask & VATTR_MTIME); /* * Set modify time (by server or by client) */ diff --git a/kernel/fs/nfs/nfs4_srv_ns.c b/kernel/fs/nfs/nfs4_srv_ns.c index 8565f8fdff..53df8e6a75 100644 --- a/kernel/fs/nfs/nfs4_srv_ns.c +++ b/kernel/fs/nfs/nfs4_srv_ns.c @@ -69,7 +69,7 @@ vop_fid_pseudo(vnode_t *vp, fid_t *fidp) if (error == EREMOTE || (error == 0 && fidp->fid_len > NFS_FH4MAXDATA)) { - va.va_mask = AT_NODEID; + va.va_mask = VATTR_NODEID; error = fop_getattr(vp, &va, 0, CRED(), NULL); if (error) return (error); @@ -711,7 +711,7 @@ treeclimb_export(struct exportinfo *exip) * Do a getattr to obtain the nodeid (inode num) * for this vnode. */ - va.va_mask = AT_NODEID; + va.va_mask = VATTR_NODEID; error = fop_getattr(vp, &va, 0, CRED(), NULL); if (error) break; diff --git a/kernel/fs/nfs/nfs4_srv_readdir.c b/kernel/fs/nfs/nfs4_srv_readdir.c index 7719c70e7c..883731ec88 100644 --- a/kernel/fs/nfs/nfs4_srv_readdir.c +++ b/kernel/fs/nfs/nfs4_srv_readdir.c @@ -839,7 +839,7 @@ reencode_attrs: ae = ar & (FATTR4_RDATTR_ERROR_MASK | FATTR4_MOUNTED_ON_FILEID_MASK); } else { - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; rddirattr_error = fop_getattr(vp, &va, 0, cs->cr, NULL); if (rddirattr_error) { diff --git a/kernel/fs/nfs/nfs4_state.c b/kernel/fs/nfs/nfs4_state.c index 6bce0a5c02..1483bce9ae 100644 --- a/kernel/fs/nfs/nfs4_state.c +++ b/kernel/fs/nfs/nfs4_state.c @@ -518,7 +518,7 @@ rfs4_ss_getstate(vnode_t *dvp, rfs4_ss_pn_t *ss_pn) /* * get the file size to do some basic validation */ - va.va_mask = AT_SIZE; + va.va_mask = VATTR_SIZE; err = fop_getattr(vp, &va, 0, CRED(), NULL); kill_file = (va.va_size == 0 || va.va_size < diff --git a/kernel/fs/nfs/nfs4_vfsops.c b/kernel/fs/nfs/nfs4_vfsops.c index 379055473e..921d45b8aa 100644 --- a/kernel/fs/nfs/nfs4_vfsops.c +++ b/kernel/fs/nfs/nfs4_vfsops.c @@ -2561,7 +2561,7 @@ nfs4rootvp(vnode_t **rtvpp, vfs_t *vfsp, struct servinfo4 *svp_head, /* If we didn't get a type, get one now */ if (rtvp->v_type == VNON) { - va.va_mask = AT_TYPE; + va.va_mask = VATTR_TYPE; error = nfs4getattr(rtvp, &va, tcr); if (error) goto bad; diff --git a/kernel/fs/nfs/nfs4_vnops.c b/kernel/fs/nfs/nfs4_vnops.c index f96ce075b4..ae9f9d517a 100644 --- a/kernel/fs/nfs/nfs4_vnops.c +++ b/kernel/fs/nfs/nfs4_vnops.c @@ -506,7 +506,7 @@ nfs4args_setattr(nfs_argop4 *argop, vattr_t *vap, vsecattr_t *vsap, int flags, * want to change this in the future (by OPENing the file). See * bug # 4474852. */ - if (vap->va_mask & AT_SIZE) { + if (vap->va_mask & VATTR_SIZE) { ASSERT(rp != NULL); mi = VTOMI4(RTOV4(rp)); @@ -825,7 +825,7 @@ nfs4open_otw(vnode_t *dvp, char *file_name, struct vattr *in_va, if ((VTOMI4(dvp)->mi_flags & MI4_GRPID || drp->r_attr.va_mode & VSGID) && drp->r_attr.va_gid != GID_NOBODY) { - in_va->va_mask |= AT_GID; + in_va->va_mask |= VATTR_GID; in_va->va_gid = drp->r_attr.va_gid; setgid_flag = 1; } @@ -1119,7 +1119,7 @@ recov_retry: /* * nverify */ - _v.va_mask = AT_GID; + _v.va_mask = VATTR_GID; _v.va_gid = in_va->va_gid; if (!(e.error = nfs4args_verify(&argop[8], &_v, OP_NVERIFY, supp_attrs))) { @@ -1127,8 +1127,8 @@ recov_retry: /* * setattr * - * We _know_ we're not messing with AT_SIZE or - * AT_XTIME, so no need for stateid or flags. + * We _know_ we're not messing with VATTR_SIZE or + * VATTR_XTIME, so no need for stateid or flags. * Also we specify NULL rp since we're only * interested in setting owner_group attributes. */ @@ -1523,7 +1523,7 @@ recov_retry: nfs4_end_op(VTOMI4(dvp), dvp, vpi, &recov_state, needrecov); if (createmode == EXCLUSIVE4 && - (in_va->va_mask & ~(AT_GID | AT_SIZE))) { + (in_va->va_mask & ~(VATTR_GID | VATTR_SIZE))) { NFS4_DEBUG(nfs4_client_state_debug, (CE_NOTE, "nfs4open_otw:" " EXCLUSIVE4: sending a SETATTR")); /* @@ -1538,7 +1538,7 @@ recov_retry: * and the cookie should be destroyed if * appropriate. * - * The AT_GID and AT_SIZE bits are turned off + * The VATTR_GID and VATTR_SIZE bits are turned off * so that the SETATTR request will not attempt * to process these. The gid will be set * separately if appropriate. The size is turned @@ -1548,8 +1548,8 @@ recov_retry: * because the file must have existed already. * Therefore, no truncate operation is needed. */ - in_va->va_mask &= ~(AT_GID | AT_SIZE); - in_va->va_mask |= (AT_MTIME | AT_ATIME); + in_va->va_mask &= ~(VATTR_GID | VATTR_SIZE); + in_va->va_mask |= (VATTR_MTIME | VATTR_ATIME); e.error = nfs4setattr(vp, in_va, 0, cr, NULL); if (e.error) { @@ -2094,8 +2094,8 @@ top: * If we don't we have a dumb server so we will * just assume every thing is ok for now. */ - if (!ep->error && garp->n4g_va.va_mask & AT_NODEID && - rp->r_attr.va_mask & AT_NODEID && + if (!ep->error && garp->n4g_va.va_mask & VATTR_NODEID && + rp->r_attr.va_mask & VATTR_NODEID && rp->r_attr.va_nodeid != garp->n4g_va.va_nodeid) { /* * We have fids, but they don't @@ -2778,7 +2778,7 @@ nfs4_write(vnode_t *vp, struct uio *uiop, int ioflag, cred_t *cr, return (EINTR); } - va.va_mask = AT_SIZE; + va.va_mask = VATTR_SIZE; error = nfs4getattr(vp, &va, cr); if (error) return (error); @@ -3653,13 +3653,13 @@ nfs4_getattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr, * call. */ if (flags & ATTR_HINT) { - if (!(vap->va_mask & ~(AT_SIZE | AT_FSID | AT_RDEV))) { + if (!(vap->va_mask & ~(VATTR_SIZE | VATTR_FSID | VATTR_RDEV))) { mutex_enter(&rp->r_statelock); - if (vap->va_mask & AT_SIZE) + if (vap->va_mask & VATTR_SIZE) vap->va_size = rp->r_size; - if (vap->va_mask & AT_FSID) + if (vap->va_mask & VATTR_FSID) vap->va_fsid = rp->r_attr.va_fsid; - if (vap->va_mask & AT_RDEV) + if (vap->va_mask & VATTR_RDEV) vap->va_rdev = rp->r_attr.va_rdev; mutex_exit(&rp->r_statelock); return (0); @@ -3671,7 +3671,7 @@ nfs4_getattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr, * and if there any dirty pages or any outstanding * asynchronous (write) requests for this file. */ - if (vap->va_mask & AT_MTIME) { + if (vap->va_mask & VATTR_MTIME) { rp = VTOR4(vp); if (nfs4_has_pages(vp)) { mutex_enter(&rp->r_statev4_lock); @@ -3725,7 +3725,7 @@ nfs4_setattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr, { int error; - if (vap->va_mask & AT_NOSET) + if (vap->va_mask & VATTR_NOSET) return (EINVAL); if (nfs_zone() != VTOMI4(vp)->mi_zone) @@ -3742,7 +3742,7 @@ nfs4_setattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr, */ error = nfs4setattr(vp, vap, flags, cr, NULL); - if (error == 0 && (vap->va_mask & AT_SIZE) && vap->va_size == 0) + if (error == 0 && (vap->va_mask & VATTR_SIZE) && vap->va_size == 0) vnevent_truncate(vp, ct); return (error); @@ -3820,9 +3820,9 @@ nfs4setattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr, } } - if (mask & AT_SIZE) { + if (mask & VATTR_SIZE) { /* - * Verification setattr compound for non-deleg AT_SIZE: + * Verification setattr compound for non-deleg VATTR_SIZE: * { Putfh; Getattr; Verify; Setattr; Getattr } * Set ctime local here (outside the do_again label) * so that subsequent retries (after failed VERIFY) @@ -3915,7 +3915,7 @@ recov_retry: /* * Verify that the ctime match before doing setattr. */ - va.va_mask = AT_CTIME; + va.va_mask = VATTR_CTIME; va.va_ctime = ctime; svp = rp->r_server; (void) nfs_rw_enter_sig(&svp->sv_lock, RW_READER, 0); @@ -3943,7 +3943,7 @@ recov_retry: * change the access permissions of the file, so purge old * information and start over again. */ - if (mask & (AT_UID | AT_GID | AT_MODE)) { + if (mask & (VATTR_UID | VATTR_GID | VATTR_MODE)) { (void) nfs4_access_purge_rp(rp); if (rp->r_secattr != NULL) { mutex_enter(&rp->r_statelock); @@ -4138,7 +4138,7 @@ recov_retry: * back in. A read should be cheaper than a * write. */ - if (mask & AT_SIZE) { + if (mask & VATTR_SIZE) { nfs4_invalidate_pages(vp, (vap->va_size & PAGEMASK), cr); } @@ -4189,7 +4189,7 @@ recov_retry: } } - if (res.status == NFS4_OK && (mask & AT_SIZE)) { + if (res.status == NFS4_OK && (mask & VATTR_SIZE)) { /* * Set the size, rather than relying on getting it updated * via a GETATTR. With delegations the client tries to @@ -4216,17 +4216,17 @@ recov_retry: * and setgid bits when changing the uid or gid. The * client needs to compensate appropriately. */ - if (mask & (AT_UID | AT_GID)) { + if (mask & (VATTR_UID | VATTR_GID)) { int terror, do_setattr; do_setattr = 0; - va.va_mask = AT_MODE; + va.va_mask = VATTR_MODE; terror = nfs4getattr(vp, &va, cr); if (!terror && - (((mask & AT_MODE) && va.va_mode != vap->va_mode) || - (!(mask & AT_MODE) && va.va_mode != omode))) { - va.va_mask = AT_MODE; - if (mask & AT_MODE) { + (((mask & VATTR_MODE) && va.va_mode != vap->va_mode) || + (!(mask & VATTR_MODE) && va.va_mode != omode))) { + va.va_mask = VATTR_MODE; + if (mask & VATTR_MODE) { /* * We asked the mode to be changed and what * we just got from the server in getattr is @@ -5558,7 +5558,7 @@ recov_retry: if (nvp->v_type == VNON) { vattr_t vattr; - vattr.va_mask = AT_TYPE; + vattr.va_mask = VATTR_TYPE; /* * N.B. We've already called nfs4_end_fop above. */ @@ -6599,7 +6599,7 @@ top: VN_RELE(tempvp); } if (!(error = fop_access(vp, mode, 0, cr, ct))) { - if ((vattr.va_mask & AT_SIZE) && + if ((vattr.va_mask & VATTR_SIZE) && vp->v_type == VREG) { rp = VTOR4(vp); /* @@ -6622,7 +6622,7 @@ top: } if (must_trunc) { - vattr.va_mask = AT_SIZE; + vattr.va_mask = VATTR_SIZE; error = nfs4setattr(vp, &vattr, 0, cr, NULL); } else { @@ -6649,8 +6649,8 @@ top: &rp->r_statelock); } } - vattr.va_mask = (AT_SIZE | - AT_TYPE | AT_MODE); + vattr.va_mask = (VATTR_SIZE | + VATTR_TYPE | VATTR_MODE); vattr.va_type = VREG; createmode = UNCHECKED4; truncating = 1; @@ -6686,7 +6686,7 @@ top: create_otw: dnlc_remove(dvp, nm); - ASSERT(vattr.va_mask & AT_TYPE); + ASSERT(vattr.va_mask & VATTR_TYPE); /* * If not a regular file let nfs4mknod() handle it. @@ -6700,7 +6700,7 @@ create_otw: /* * It _is_ a regular file. */ - ASSERT(vattr.va_mask & AT_MODE); + ASSERT(vattr.va_mask & VATTR_MODE); if (MANDMODE(vattr.va_mode)) { nfs_rw_exit(&drp->r_rwlock); return (EACCES); @@ -6720,7 +6720,7 @@ create_otw: if (vp != NULL) { /* if create was successful, throw away the file's pages */ - if (!error && (vattr.va_mask & AT_SIZE)) + if (!error && (vattr.va_mask & VATTR_SIZE)) nfs4_invalidate_pages(vp, (vattr.va_size & PAGEMASK), cr); /* release the lookup hold */ @@ -6835,7 +6835,7 @@ call_nfs4_create_req(vnode_t *dvp, char *nm, void *data, struct vattr *va, struct vattr dva; va->va_mode &= ~VSGID; - dva.va_mask = AT_MODE | AT_GID; + dva.va_mask = VATTR_MODE | VATTR_GID; if (fop_getattr(dvp, &dva, 0, cr, NULL) == 0) { /* @@ -6849,7 +6849,7 @@ call_nfs4_create_req(vnode_t *dvp, char *nm, void *data, struct vattr *va, setgid_flag = 1; va->va_mode |= VSGID; if (dva.va_gid != GID_NOBODY) { - va->va_mask |= AT_GID; + va->va_mask |= VATTR_GID; va->va_gid = dva.va_gid; } } @@ -6971,7 +6971,7 @@ recov_retry: * XXX - Revisit the last argument to nfs4_end_op() * once 5020486 is fixed. */ - _v.va_mask = AT_GID; + _v.va_mask = VATTR_GID; _v.va_gid = va->va_gid; if (e.error = nfs4args_verify(&argop[8], &_v, OP_NVERIFY, supp_attrs)) { @@ -6985,10 +6985,10 @@ recov_retry: /* * setattr * - * We _know_ we're not messing with AT_SIZE or AT_XTIME, - * so no need for stateid or flags. Also we specify NULL - * rp since we're only interested in setting owner_group - * attributes. + * We _know_ we're not messing with VATTR_SIZE or + * VATTR_XTIME, so no need for stateid or flags. Also we + * specify NULL rp since we're only interested in setting + * owner_group attributes. */ nfs4args_setattr(&argop[9], &_v, NULL, 0, NULL, cr, supp_attrs, &e.error, 0); @@ -7089,7 +7089,7 @@ recov_retry: *vpp = vp = makenfs4node(sfhp, NULL, dvp->v_vfsp, t, cr, dvp, fn_get(VTOSV(dvp)->sv_name, nm, sfhp)); if (vp->v_type == VNON) { - vattr.va_mask = AT_TYPE; + vattr.va_mask = VATTR_TYPE; /* * Need to call nfs4_end_op before nfs4getattr to avoid * potential nfs4_start_op deadlock. See RFE 4777612. @@ -7188,7 +7188,7 @@ nfs4mknod(vnode_t *dvp, char *nm, struct vattr *va, enum vcexcl exclusive, * to set group correctly, not sure what hope setattr has. */ if (va->va_gid != VTOR4(vp)->r_attr.va_gid) { - va->va_mask = AT_GID; + va->va_mask = VATTR_GID; (void) nfs4setattr(vp, va, 0, cr, NULL); } @@ -8615,7 +8615,7 @@ nfs4_mkdir(vnode_t *dvp, char *nm, struct vattr *va, vnode_t **vpp, cred_t *cr, * Decision to get the right gid and setgid bit of the * new directory is now made in call_nfs4_create_req. */ - va->va_mask |= AT_MODE; + va->va_mask |= VATTR_MODE; error = call_nfs4_create_req(dvp, nm, NULL, va, &vp, cr, NF4DIR); if (error) return (error); @@ -9467,7 +9467,7 @@ recov_retry: * The d_ino of .. must be the inode number * of the mounted filesystem. */ - if (garp->n4g_va.va_mask & AT_NODEID) + if (garp->n4g_va.va_mask & VATTR_NODEID) rd_res->dotdotp->d_ino = garp->n4g_va.va_nodeid; @@ -10496,7 +10496,7 @@ nfs4_map(vnode_t *vp, offset_t off, struct as *as, caddr_t *addrp, */ if (flk_has_remote_locks(vp)) { struct vattr va; - va.va_mask = AT_MODE; + va.va_mask = VATTR_MODE; error = nfs4getattr(vp, &va, cr); if (error != 0) goto done; @@ -10989,7 +10989,7 @@ nfs4_space(vnode_t *vp, int cmd, struct flock64 *bfp, int flag, if (bfp->l_len == 0) { struct vattr va; - va.va_mask = AT_SIZE; + va.va_mask = VATTR_SIZE; va.va_size = bfp->l_start; error = nfs4setattr(vp, &va, 0, cr, NULL); @@ -14510,7 +14510,7 @@ nfs4_safelock(vnode_t *vp, const struct flock64 *bfp, cred_t *cr) } /* mandatory locking and mapping don't mix */ - va.va_mask = AT_MODE; + va.va_mask = VATTR_MODE; error = fop_getattr(vp, &va, 0, cr, NULL); if (error != 0) { NFS4_DEBUG(nfs4_client_lock_debug, (CE_NOTE, "nfs4_safelock: " diff --git a/kernel/fs/nfs/nfs4_xdr.c b/kernel/fs/nfs/nfs4_xdr.c index 36b19fe657..f429182b17 100644 --- a/kernel/fs/nfs/nfs4_xdr.c +++ b/kernel/fs/nfs/nfs4_xdr.c @@ -820,7 +820,7 @@ static void xdr_ga_prefill_vattr(struct nfs4_ga_res *garp, struct mntinfo4 *mi) { static vattr_t s_vattr = { - AT_ALL, /* va_mask */ + VATTR_ALL, /* va_mask */ VNON, /* va_type */ 0777, /* va_mode */ UID_NOBODY, /* va_uid */ @@ -919,7 +919,7 @@ xdr_ga_fattr_res(XDR *xdrs, struct nfs4_ga_res *garp, bitmap4 resbmap, if (vap->va_type == VBLK) vap->va_blksize = DEV_BSIZE; - vap->va_mask |= AT_TYPE; + vap->va_mask |= VATTR_TYPE; } if (resbmap & FATTR4_FH_EXPIRE_TYPE_MASK) { if (!XDR_GETINT32(xdrs, (int *)&gesp->n4g_fet)) @@ -939,7 +939,7 @@ xdr_ga_fattr_res(XDR *xdrs, struct nfs4_ga_res *garp, bitmap4 resbmap, garp->n4g_attrerr = EFBIG; garp->n4g_attrwhy = NFS4_GETATTR_ATSIZE_ERR; } else { - vap->va_mask |= AT_SIZE; + vap->va_mask |= VATTR_SIZE; } } if (resbmap & FATTR4_LINK_SUPPORT_MASK) { @@ -1069,7 +1069,7 @@ xdr_ga_fattr_res(XDR *xdrs, struct nfs4_ga_res *garp, bitmap4 resbmap, if (!xdr_u_longlong_t(xdrs, (u_longlong_t *)&vap->va_nodeid)) return (FALSE); - vap->va_mask |= AT_NODEID; + vap->va_mask |= VATTR_NODEID; } if (resbmap & FATTR4_FILES_AVAIL_MASK) { if (!xdr_u_longlong_t(xdrs, @@ -1153,7 +1153,7 @@ xdr_ga_fattr_res(XDR *xdrs, struct nfs4_ga_res *garp, bitmap4 resbmap, if (resbmap & FATTR4_MODE_MASK) { if (!XDR_GETINT32(xdrs, (int *)&vap->va_mode)) return (FALSE); - vap->va_mask |= AT_MODE; + vap->va_mask |= VATTR_MODE; } if (resbmap & FATTR4_NO_TRUNC_MASK) { if (!XDR_GETINT32(xdrs, (int *)&truefalse)) @@ -1164,7 +1164,7 @@ xdr_ga_fattr_res(XDR *xdrs, struct nfs4_ga_res *garp, bitmap4 resbmap, if (resbmap & FATTR4_NUMLINKS_MASK) { if (!XDR_GETINT32(xdrs, (int *)&vap->va_nlink)) return (FALSE); - vap->va_mask |= AT_NLINK; + vap->va_mask |= VATTR_NLINK; } } if (resbmap & @@ -1212,7 +1212,7 @@ xdr_ga_fattr_res(XDR *xdrs, struct nfs4_ga_res *garp, bitmap4 resbmap, bcmp(owner_val, pug->u_last.utf8string_val, *owner_length) == 0) { vap->va_uid = pug->uid; - vap->va_mask |= AT_UID; + vap->va_mask |= VATTR_UID; } else { uid_t uid; @@ -1236,7 +1236,7 @@ xdr_ga_fattr_res(XDR *xdrs, struct nfs4_ga_res *garp, bitmap4 resbmap, NFS4_GETATTR_ATUID_ERR; } else { vap->va_uid = uid; - vap->va_mask |= AT_UID; + vap->va_mask |= VATTR_UID; if (pug && ol <= MAX_OG_NAME) { pug->uid = uid; U_SWAP_CURR_LAST(pug); @@ -1285,7 +1285,7 @@ xdr_ga_fattr_res(XDR *xdrs, struct nfs4_ga_res *garp, bitmap4 resbmap, bcmp(group_val, pug->g_last.utf8string_val, *group_length) == 0) { vap->va_gid = pug->gid; - vap->va_mask |= AT_GID; + vap->va_mask |= VATTR_GID; } else { uid_t gid; @@ -1309,7 +1309,7 @@ xdr_ga_fattr_res(XDR *xdrs, struct nfs4_ga_res *garp, bitmap4 resbmap, NFS4_GETATTR_ATGID_ERR; } else { vap->va_gid = gid; - vap->va_mask |= AT_GID; + vap->va_mask |= VATTR_GID; if (pug && gl <= MAX_OG_NAME) { pug->gid = gid; G_SWAP_CURR_LAST(pug); @@ -1349,7 +1349,7 @@ xdr_ga_fattr_res(XDR *xdrs, struct nfs4_ga_res *garp, bitmap4 resbmap, } else { vap->va_rdev = 0; } - vap->va_mask |= AT_RDEV; + vap->va_mask |= VATTR_RDEV; } if (resbmap & FATTR4_SPACE_AVAIL_MASK) { if (!xdr_u_longlong_t(xdrs, @@ -1376,7 +1376,7 @@ xdr_ga_fattr_res(XDR *xdrs, struct nfs4_ga_res *garp, bitmap4 resbmap, return (FALSE); /* Compute space depending on device type */ - ASSERT((vap->va_mask & AT_TYPE)); + ASSERT((vap->va_mask & VATTR_TYPE)); if (vap->va_type == VREG || vap->va_type == VDIR || vap->va_type == VLNK) { vap->va_nblocks = (u_longlong_t) @@ -1385,7 +1385,7 @@ xdr_ga_fattr_res(XDR *xdrs, struct nfs4_ga_res *garp, bitmap4 resbmap, } else { vap->va_nblocks = 0; } - vap->va_mask |= AT_NBLOCKS; + vap->va_mask |= VATTR_NBLOCKS; } if (resbmap & FATTR4_SYSTEM_MASK) { ASSERT(0); @@ -1416,7 +1416,7 @@ xdr_ga_fattr_res(XDR *xdrs, struct nfs4_ga_res *garp, bitmap4 resbmap, garp->n4g_attrerr = error; garp->n4g_attrwhy = NFS4_GETATTR_ATATIME_ERR; } - vap->va_mask |= AT_ATIME; + vap->va_mask |= VATTR_ATIME; } if (resbmap & FATTR4_TIME_ACCESS_SET_MASK) { ASSERT(0); @@ -1446,7 +1446,7 @@ xdr_ga_fattr_res(XDR *xdrs, struct nfs4_ga_res *garp, bitmap4 resbmap, garp->n4g_attrerr = error; garp->n4g_attrwhy = NFS4_GETATTR_ATCTIME_ERR; } - vap->va_mask |= AT_CTIME; + vap->va_mask |= VATTR_CTIME; } if (resbmap & FATTR4_TIME_MODIFY_MASK) { nfstime4 mtime; @@ -1462,7 +1462,7 @@ xdr_ga_fattr_res(XDR *xdrs, struct nfs4_ga_res *garp, bitmap4 resbmap, garp->n4g_attrerr = error; garp->n4g_attrwhy = NFS4_GETATTR_ATMTIME_ERR; } - vap->va_mask |= AT_MTIME; + vap->va_mask |= VATTR_MTIME; } if (resbmap & FATTR4_TIME_MODIFY_SET_MASK) { ASSERT(0); @@ -1588,7 +1588,7 @@ xdr_ga_fattr_res_inline(uint32_t *ptr, struct nfs4_ga_res *garp, if (vap->va_type == VBLK) vap->va_blksize = DEV_BSIZE; - vap->va_mask |= AT_TYPE; + vap->va_mask |= VATTR_TYPE; } if (resbmap & FATTR4_FH_EXPIRE_TYPE_MASK) { gesp->n4g_fet = IXDR_GET_U_INT32(ptr); @@ -1604,7 +1604,7 @@ xdr_ga_fattr_res_inline(uint32_t *ptr, struct nfs4_ga_res *garp, garp->n4g_attrerr = EFBIG; garp->n4g_attrwhy = NFS4_GETATTR_ATSIZE_ERR; } else { - vap->va_mask |= AT_SIZE; + vap->va_mask |= VATTR_SIZE; } } if (resbmap & FATTR4_LINK_SUPPORT_MASK) { @@ -1707,7 +1707,7 @@ xdr_ga_fattr_res_inline(uint32_t *ptr, struct nfs4_ga_res *garp, } if (resbmap & FATTR4_FILEID_MASK) { IXDR_GET_U_HYPER(ptr, vap->va_nodeid); - vap->va_mask |= AT_NODEID; + vap->va_mask |= VATTR_NODEID; } if (resbmap & FATTR4_FILES_AVAIL_MASK) { IXDR_GET_U_HYPER(ptr, gesp->n4g_sb.f_favail); @@ -1771,7 +1771,7 @@ xdr_ga_fattr_res_inline(uint32_t *ptr, struct nfs4_ga_res *garp, } if (resbmap & FATTR4_MODE_MASK) { vap->va_mode = IXDR_GET_U_INT32(ptr); - vap->va_mask |= AT_MODE; + vap->va_mask |= VATTR_MODE; } if (resbmap & FATTR4_NO_TRUNC_MASK) { truefalse = IXDR_GET_U_INT32(ptr); @@ -1780,7 +1780,7 @@ xdr_ga_fattr_res_inline(uint32_t *ptr, struct nfs4_ga_res *garp, } if (resbmap & FATTR4_NUMLINKS_MASK) { vap->va_nlink = IXDR_GET_U_INT32(ptr); - vap->va_mask |= AT_NLINK; + vap->va_mask |= VATTR_NLINK; } } if (resbmap & @@ -1818,7 +1818,7 @@ xdr_ga_fattr_res_inline(uint32_t *ptr, struct nfs4_ga_res *garp, bcmp(owner_val, pug->u_last.utf8string_val, *owner_length) == 0) { vap->va_uid = pug->uid; - vap->va_mask |= AT_UID; + vap->va_mask |= VATTR_UID; } else { uid_t uid; @@ -1842,7 +1842,7 @@ xdr_ga_fattr_res_inline(uint32_t *ptr, struct nfs4_ga_res *garp, NFS4_GETATTR_ATUID_ERR; } else { vap->va_uid = uid; - vap->va_mask |= AT_UID; + vap->va_mask |= VATTR_UID; /* save the results for next time */ if (pug && ol <= MAX_OG_NAME) { pug->uid = uid; @@ -1886,7 +1886,7 @@ xdr_ga_fattr_res_inline(uint32_t *ptr, struct nfs4_ga_res *garp, bcmp(group_val, pug->g_last.utf8string_val, *group_length) == 0) { vap->va_gid = pug->gid; - vap->va_mask |= AT_GID; + vap->va_mask |= VATTR_GID; } else { uid_t gid; @@ -1910,7 +1910,7 @@ xdr_ga_fattr_res_inline(uint32_t *ptr, struct nfs4_ga_res *garp, NFS4_GETATTR_ATGID_ERR; } else { vap->va_gid = gid; - vap->va_mask |= AT_GID; + vap->va_mask |= VATTR_GID; if (pug && gl <= MAX_OG_NAME) { pug->gid = gid; pug->g_curr.utf8string_len = @@ -1954,7 +1954,7 @@ xdr_ga_fattr_res_inline(uint32_t *ptr, struct nfs4_ga_res *garp, } else { vap->va_rdev = 0; } - vap->va_mask |= AT_RDEV; + vap->va_mask |= VATTR_RDEV; } if (resbmap & FATTR4_SPACE_AVAIL_MASK) { IXDR_GET_U_HYPER(ptr, gesp->n4g_sb.f_bavail); @@ -1973,7 +1973,7 @@ xdr_ga_fattr_res_inline(uint32_t *ptr, struct nfs4_ga_res *garp, IXDR_GET_U_HYPER(ptr, space_used); /* Compute space depending on device type */ - ASSERT((vap->va_mask & AT_TYPE)); + ASSERT((vap->va_mask & VATTR_TYPE)); if (vap->va_type == VREG || vap->va_type == VDIR || vap->va_type == VLNK) { vap->va_nblocks = (u_longlong_t) @@ -1982,7 +1982,7 @@ xdr_ga_fattr_res_inline(uint32_t *ptr, struct nfs4_ga_res *garp, } else { vap->va_nblocks = 0; } - vap->va_mask |= AT_NBLOCKS; + vap->va_mask |= VATTR_NBLOCKS; } if (resbmap & FATTR4_SYSTEM_MASK) { ASSERT(0); @@ -2011,7 +2011,7 @@ xdr_ga_fattr_res_inline(uint32_t *ptr, struct nfs4_ga_res *garp, garp->n4g_attrerr = error; garp->n4g_attrwhy = NFS4_GETATTR_ATATIME_ERR; } - vap->va_mask |= AT_ATIME; + vap->va_mask |= VATTR_ATIME; } if (resbmap & FATTR4_TIME_ACCESS_SET_MASK) { ASSERT(0); @@ -2038,7 +2038,7 @@ xdr_ga_fattr_res_inline(uint32_t *ptr, struct nfs4_ga_res *garp, garp->n4g_attrerr = error; garp->n4g_attrwhy = NFS4_GETATTR_ATCTIME_ERR; } - vap->va_mask |= AT_CTIME; + vap->va_mask |= VATTR_CTIME; } if (resbmap & FATTR4_TIME_MODIFY_MASK) { nfstime4 mtime; @@ -2052,7 +2052,7 @@ xdr_ga_fattr_res_inline(uint32_t *ptr, struct nfs4_ga_res *garp, garp->n4g_attrerr = error; garp->n4g_attrwhy = NFS4_GETATTR_ATMTIME_ERR; } - vap->va_mask |= AT_MTIME; + vap->va_mask |= VATTR_MTIME; } if (resbmap & FATTR4_TIME_MODIFY_SET_MASK) { ASSERT(0); @@ -2287,7 +2287,7 @@ xdr_READDIR4res_clnt(XDR *xdrs, READDIR4res_clnt *objp, READDIR4args *aobjp) */ if (gar.n4g_mon_fid_valid) dp->d_ino = gar.n4g_mon_fid; - else if (gar.n4g_va.va_mask & AT_NODEID) + else if (gar.n4g_va.va_mask & VATTR_NODEID) dp->d_ino = gar.n4g_va.va_nodeid; else dp->d_ino = 0; diff --git a/kernel/fs/nfs/nfs_acl_srv.c b/kernel/fs/nfs/nfs_acl_srv.c index baaebe9514..165ef2ece2 100644 --- a/kernel/fs/nfs/nfs_acl_srv.c +++ b/kernel/fs/nfs/nfs_acl_srv.c @@ -120,7 +120,7 @@ acl2_getacl(GETACL2args *args, GETACL2res *resp, struct exportinfo *exi, return; } - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; error = rfs4_delegated_getattr(vp, &va, 0, cr); VN_RELE(vp); @@ -218,7 +218,7 @@ acl2_setacl(SETACL2args *args, SETACL2res *resp, struct exportinfo *exi, return; } - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; error = rfs4_delegated_getattr(vp, &va, 0, cr); fop_rwunlock(vp, V_WRITELOCK_TRUE, NULL); @@ -258,7 +258,7 @@ acl2_getattr(GETATTR2args *args, GETATTR2res *resp, struct exportinfo *exi, return; } - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; error = rfs4_delegated_getattr(vp, &va, 0, cr); VN_RELE(vp); @@ -315,7 +315,7 @@ acl2_access(ACCESS2args *args, ACCESS2res *resp, struct exportinfo *exi, * mandatory lock files is denied on the server, so it might * as well be reflected to the server during the open. */ - va.va_mask = AT_MODE; + va.va_mask = VATTR_MODE; error = fop_getattr(vp, &va, 0, cr, NULL); if (error) { VN_RELE(vp); @@ -354,7 +354,7 @@ acl2_access(ACCESS2args *args, ACCESS2res *resp, struct exportinfo *exi, resp->resok.access |= ACCESS2_EXECUTE; } - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; error = rfs4_delegated_getattr(vp, &va, 0, cr); VN_RELE(vp); @@ -418,7 +418,7 @@ acl2_getxattrdir(GETXATTRDIR2args *args, GETXATTRDIR2res *resp, } if (!error) { struct vattr va; - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; error = rfs4_delegated_getattr(avp, &va, 0, cr); if (!error) { error = vattr_to_nattr(&va, &resp->resok.attr); @@ -461,7 +461,7 @@ acl3_getacl(GETACL3args *args, GETACL3res *resp, struct exportinfo *exi, goto out; } - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; vap = rfs4_delegated_getattr(vp, &va, 0, cr) ? NULL : &va; bzero((caddr_t)&resp->resok.acl, sizeof (resp->resok.acl)); @@ -492,7 +492,7 @@ acl3_getacl(GETACL3args *args, GETACL3res *resp, struct exportinfo *exi, if (error) goto out; - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; vap = rfs4_delegated_getattr(vp, &va, 0, cr) ? NULL : &va; VN_RELE(vp); @@ -574,7 +574,7 @@ acl3_setacl(SETACL3args *args, SETACL3res *resp, struct exportinfo *exi, (void) fop_rwlock(vp, V_WRITELOCK_TRUE, NULL); - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; vap = rfs4_delegated_getattr(vp, &va, 0, cr) ? NULL : &va; if (rdonly(ro, vp)) { @@ -584,7 +584,7 @@ acl3_setacl(SETACL3args *args, SETACL3res *resp, struct exportinfo *exi, error = fop_setsecattr(vp, &args->acl, 0, cr, NULL); - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; vap = rfs4_delegated_getattr(vp, &va, 0, cr) ? NULL : &va; if (error) @@ -659,7 +659,7 @@ acl3_getxattrdir(GETXATTRDIR3args *args, GETXATTRDIR3res *resp, } if (!error) { struct vattr va; - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; error = rfs4_delegated_getattr(avp, &va, 0, cr); if (!error) { vattr_to_post_op_attr(&va, &resp->resok.attr); diff --git a/kernel/fs/nfs/nfs_acl_vnops.c b/kernel/fs/nfs/nfs_acl_vnops.c index 0d4a22ce68..9fbde4aea5 100644 --- a/kernel/fs/nfs/nfs_acl_vnops.c +++ b/kernel/fs/nfs/nfs_acl_vnops.c @@ -660,7 +660,7 @@ acl_getxattrdir3(vnode_t *vp, vnode_t **vpp, bool_t create, cred_t *cr, nvp = makenfs3node(&res.resok.fh, NULL, vp->v_vfsp, t, cr, VTOR(vp)->r_path, XATTR_RPATH); if (nvp->v_type == VNON) { - vattr.va_mask = AT_TYPE; + vattr.va_mask = VATTR_TYPE; error = nfs3getattr(nvp, &vattr, cr); if (error) { VN_RELE(nvp); diff --git a/kernel/fs/nfs/nfs_client.c b/kernel/fs/nfs/nfs_client.c index d956629a6a..82e71bec11 100644 --- a/kernel/fs/nfs/nfs_client.c +++ b/kernel/fs/nfs/nfs_client.c @@ -148,7 +148,7 @@ nfs_validate_caches(vnode_t *vp, cred_t *cr) return (0); } - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; return (nfs_getattr_otw(vp, &va, cr)); } @@ -175,7 +175,7 @@ nfs3_validate_caches(vnode_t *vp, cred_t *cr) return (0); } - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; return (nfs3_getattr_otw(vp, &va, cr)); } @@ -1023,7 +1023,7 @@ nattr_to_vattr(vnode_t *vp, struct nfsfattr *na, struct vattr *vap) return (EOVERFLOW); #endif - vap->va_mask = AT_ALL; + vap->va_mask = VATTR_ALL; if (na->na_type < NFNON || na->na_type > NFSOC) vap->va_type = VBAD; @@ -1114,7 +1114,7 @@ fattr3_to_vattr(vnode_t *vp, fattr3 *na, struct vattr *vap) /* file too big */ return (EFBIG); - vap->va_mask = AT_ALL; + vap->va_mask = VATTR_ALL; if (na->type < NF3REG || na->type > NF3FIFO) vap->va_type = VBAD; diff --git a/kernel/fs/nfs/nfs_log.c b/kernel/fs/nfs/nfs_log.c index d35147d128..123937acab 100644 --- a/kernel/fs/nfs/nfs_log.c +++ b/kernel/fs/nfs/nfs_log.c @@ -458,7 +458,7 @@ log_file_create(caddr_t origname, struct log_file **lfpp) mutex_init(&logfile->lf_lock, NULL, MUTEX_DEFAULT, NULL); rfsl_log_file++; - va.va_mask = AT_SIZE; + va.va_mask = VATTR_SIZE; error = fop_getattr(vp, &va, 0, CRED(), NULL); if (error) { nfs_cmn_err(error, CE_WARN, @@ -821,7 +821,7 @@ nfslog_write_logrecords(struct log_file *lfp, * Save the size. If the write fails, reset the size to avoid * corrupted log buffer files. */ - va.va_mask = AT_SIZE; + va.va_mask = VATTR_SIZE; (void) fop_rwlock(vp, V_WRITELOCK_TRUE, NULL); /* UIO_WRITE */ if ((error = fop_getattr(vp, &va, 0, CRED(), NULL)) == 0) { diff --git a/kernel/fs/nfs/nfs_srv.c b/kernel/fs/nfs/nfs_srv.c index b588ac4b96..d818f12c2d 100644 --- a/kernel/fs/nfs/nfs_srv.c +++ b/kernel/fs/nfs/nfs_srv.c @@ -112,7 +112,7 @@ rfs_getattr(fhandle_t *fhp, struct nfsattrstat *ns, struct exportinfo *exi, /* * Do the getattr. */ - va.va_mask = AT_ALL; /* we want all the attributes */ + va.va_mask = VATTR_ALL; /* we want all the attributes */ error = rfs4_delegated_getattr(vp, &va, 0, cr); @@ -187,11 +187,11 @@ rfs_setattr(struct nfssaargs *args, struct nfsattrstat *ns, * This is an overload of the protocol and should be * documented in the NFS Version 2 protocol specification. */ - if (va.va_mask & AT_MTIME) { + if (va.va_mask & VATTR_MTIME) { if (va.va_mtime.tv_nsec == 1000000000) { gethrestime(&va.va_mtime); va.va_atime = va.va_mtime; - va.va_mask |= AT_ATIME; + va.va_mask |= VATTR_ATIME; flag = 0; } else flag = ATTR_UTIME; @@ -202,7 +202,7 @@ rfs_setattr(struct nfssaargs *args, struct nfsattrstat *ns, * If the filesystem is exported with nosuid, then mask off * the setuid and setgid bits. */ - if ((va.va_mask & AT_MODE) && vp->v_type == VREG && + if ((va.va_mask & VATTR_MODE) && vp->v_type == VREG && (exi->exi_export.ex_flags & EX_NOSUID)) va.va_mode &= ~(VSUID | VSGID); @@ -228,13 +228,13 @@ rfs_setattr(struct nfssaargs *args, struct nfsattrstat *ns, * size of the file if there is a conflicting non-blocking * mandatory lock in the region of change. */ - if (vp->v_type == VREG && va.va_mask & AT_SIZE) { + if (vp->v_type == VREG && va.va_mask & VATTR_SIZE) { if (nbl_need_check(vp)) { nbl_start_crit(vp, RW_READER); in_crit = 1; } - bva.va_mask = AT_UID | AT_SIZE; + bva.va_mask = VATTR_UID | VATTR_SIZE; error = fop_getattr(vp, &bva, 0, cr, &ct); @@ -265,7 +265,7 @@ rfs_setattr(struct nfssaargs *args, struct nfsattrstat *ns, if (crgetuid(cr) == bva.va_uid && !error && va.va_size != bva.va_size) { - va.va_mask &= ~AT_SIZE; + va.va_mask &= ~VATTR_SIZE; bf.l_type = F_WRLCK; bf.l_whence = 0; bf.l_start = (off64_t)va.va_size; @@ -301,7 +301,7 @@ rfs_setattr(struct nfssaargs *args, struct nfsattrstat *ns, } if (!error) { - va.va_mask = AT_ALL; /* get everything */ + va.va_mask = VATTR_ALL; /* get everything */ error = rfs4_delegated_getattr(vp, &va, 0, cr); @@ -418,7 +418,7 @@ rfs_lookup(struct nfsdiropargs *da, struct nfsdiropres *dr, if (!error) { - va.va_mask = AT_ALL; /* we want everything */ + va.va_mask = VATTR_ALL; /* we want everything */ error = rfs4_delegated_getattr(vp, &va, 0, cr); @@ -494,7 +494,7 @@ rfs_readlink(fhandle_t *fhp, struct nfsrdlnres *rl, struct exportinfo *exi, return; } - va.va_mask = AT_MODE; + va.va_mask = VATTR_MODE; error = fop_getattr(vp, &va, 0, cr, NULL); @@ -683,7 +683,7 @@ rfs_read(struct nfsreadargs *ra, struct nfsrdresult *rr, return; } - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; error = fop_getattr(vp, &va, 0, cr, &ct); @@ -822,7 +822,7 @@ rfs_read(struct nfsreadargs *ra, struct nfsrdresult *rr, * Get attributes again so we can send the latest access * time to the client side for its cache. */ - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; error = fop_getattr(vp, &va, 0, cr, &ct); @@ -945,7 +945,7 @@ rfs_write_sync(struct nfswriteargs *wa, struct nfsattrstat *ns, ct.cc_caller_id = nfs2_srv_caller_id; ct.cc_flags = CC_DONTBLOCK; - va.va_mask = AT_UID|AT_MODE; + va.va_mask = VATTR_UID|VATTR_MODE; error = fop_getattr(vp, &va, 0, cr, &ct); @@ -1097,7 +1097,7 @@ rfs_write_sync(struct nfswriteargs *wa, struct nfsattrstat *ns, * Get attributes again so we send the latest mod * time to the client side for its cache. */ - va.va_mask = AT_ALL; /* now we want everything */ + va.va_mask = VATTR_ALL; /* now we want everything */ error = fop_getattr(vp, &va, 0, cr, &ct); @@ -1415,7 +1415,7 @@ rfs_write(struct nfswriteargs *wa, struct nfsattrstat *ns, continue; } - va.va_mask = AT_UID|AT_MODE; + va.va_mask = VATTR_UID|VATTR_MODE; error = fop_getattr(vp, &va, 0, rp->cr, &ct); @@ -1591,7 +1591,7 @@ rfs_write(struct nfswriteargs *wa, struct nfsattrstat *ns, * Get attributes again so we send the latest mod * time to the client side for its cache. */ - va.va_mask = AT_ALL; /* now we want everything */ + va.va_mask = VATTR_ALL; /* now we want everything */ error = fop_getattr(vp, &va, 0, rp->cr, &ct); @@ -1700,7 +1700,7 @@ rfs_create(struct nfscreatargs *args, struct nfsdiropres *dr, /* * Must specify the mode. */ - if (!(va.va_mask & AT_MODE)) { + if (!(va.va_mask & VATTR_MODE)) { VN_RELE(dvp); dr->dr_status = NFSERR_INVAL; return; @@ -1725,7 +1725,7 @@ rfs_create(struct nfscreatargs *args, struct nfsdiropres *dr, else va.va_rdev = (dev_t)va.va_size; } - va.va_mask &= ~AT_SIZE; + va.va_mask &= ~VATTR_SIZE; } else if ((va.va_mode & IFMT) == IFBLK) { va.va_type = VBLK; /* @@ -1737,14 +1737,14 @@ rfs_create(struct nfscreatargs *args, struct nfsdiropres *dr, va.va_rdev = nfsv2_expdev(va.va_size); else va.va_rdev = (dev_t)va.va_size; - va.va_mask &= ~AT_SIZE; + va.va_mask &= ~VATTR_SIZE; } else if ((va.va_mode & IFMT) == IFSOCK) { va.va_type = VSOCK; } else { va.va_type = VREG; } va.va_mode &= ~IFMT; - va.va_mask |= AT_TYPE; + va.va_mask |= VATTR_TYPE; ca = (struct sockaddr *)svc_getrpccaller(req->rq_xprt)->buf; name = nfscmd_convname(ca, exi, name, NFSCMD_CONV_INBOUND, @@ -1763,14 +1763,14 @@ rfs_create(struct nfscreatargs *args, struct nfsdiropres *dr, */ lookup_ok = 0; mode = VWRITE; - if (!(va.va_mask & AT_SIZE) || va.va_type != VREG) { + if (!(va.va_mask & VATTR_SIZE) || va.va_type != VREG) { error = fop_lookup(dvp, name, &tvp, NULL, 0, NULL, cr, NULL, NULL, NULL); if (!error) { struct vattr at; lookup_ok = 1; - at.va_mask = AT_MODE; + at.va_mask = VATTR_MODE; error = fop_getattr(tvp, &at, 0, cr, NULL); if (!error) mode = (at.va_mode & S_IWUSR) ? VWRITE : VREAD; @@ -1796,7 +1796,7 @@ rfs_create(struct nfscreatargs *args, struct nfsdiropres *dr, * locks in the region being manipulated. Return EACCES if there * are conflicting locks. */ - if (!error && (va.va_type == VREG) && (va.va_mask & AT_SIZE)) { + if (!error && (va.va_type == VREG) && (va.va_mask & VATTR_SIZE)) { lookuperr = fop_lookup(dvp, name, &tvp, NULL, 0, NULL, cr, NULL, NULL, NULL); @@ -1820,7 +1820,7 @@ rfs_create(struct nfscreatargs *args, struct nfsdiropres *dr, nbl_start_crit(tvp, RW_READER); in_crit = 1; - bva.va_mask = AT_SIZE; + bva.va_mask = VATTR_SIZE; error = fop_getattr(tvp, &bva, 0, cr, NULL); if (!error) { if (va.va_size < bva.va_size) { @@ -1861,7 +1861,7 @@ rfs_create(struct nfscreatargs *args, struct nfsdiropres *dr, if (!error) { - if ((va.va_mask & AT_SIZE) && (va.va_size == 0)) + if ((va.va_mask & VATTR_SIZE) && (va.va_size == 0)) trunc = TRUE; else trunc = FALSE; @@ -1871,7 +1871,7 @@ rfs_create(struct nfscreatargs *args, struct nfsdiropres *dr, curthread->t_flag |= T_WOULDBLOCK; goto out; } - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; error = fop_getattr(vp, &va, 0, cr, NULL); @@ -2293,7 +2293,7 @@ rfs_symlink(struct nfsslargs *args, enum nfsstat *status, return; } - if (!(va.va_mask & AT_MODE)) { + if (!(va.va_mask & VATTR_MODE)) { VN_RELE(vp); *status = NFSERR_INVAL; return; @@ -2309,7 +2309,7 @@ rfs_symlink(struct nfsslargs *args, enum nfsstat *status, } va.va_type = VLNK; - va.va_mask |= AT_TYPE; + va.va_mask |= VATTR_TYPE; error = fop_symlink(vp, args->sla_from.da_name, &va, name, cr, NULL, 0); @@ -2385,14 +2385,14 @@ rfs_mkdir(struct nfscreatargs *args, struct nfsdiropres *dr, return; } - if (!(va.va_mask & AT_MODE)) { + if (!(va.va_mask & VATTR_MODE)) { VN_RELE(vp); dr->dr_status = NFSERR_INVAL; return; } va.va_type = VDIR; - va.va_mask |= AT_TYPE; + va.va_mask |= VATTR_TYPE; error = fop_mkdir(vp, name, &va, &dvp, cr, NULL, 0, NULL); @@ -2401,7 +2401,7 @@ rfs_mkdir(struct nfscreatargs *args, struct nfsdiropres *dr, * Attribtutes of the newly created directory should * be returned to the client. */ - va.va_mask = AT_ALL; /* We want everything */ + va.va_mask = VATTR_ALL; /* We want everything */ error = fop_getattr(dvp, &va, 0, cr, NULL); /* check for overflows */ @@ -2703,19 +2703,19 @@ sattr_to_vattr(struct nfssattr *sa, struct vattr *vap) */ if (sa->sa_mode != (uint32_t)((ushort_t)-1) && sa->sa_mode != (uint32_t)-1) { - vap->va_mask |= AT_MODE; + vap->va_mask |= VATTR_MODE; vap->va_mode = sa->sa_mode; } if (sa->sa_uid != (uint32_t)-1) { - vap->va_mask |= AT_UID; + vap->va_mask |= VATTR_UID; vap->va_uid = sa->sa_uid; } if (sa->sa_gid != (uint32_t)-1) { - vap->va_mask |= AT_GID; + vap->va_mask |= VATTR_GID; vap->va_gid = sa->sa_gid; } if (sa->sa_size != (uint32_t)-1) { - vap->va_mask |= AT_SIZE; + vap->va_mask |= VATTR_SIZE; vap->va_size = sa->sa_size; } if (sa->sa_atime.tv_sec != (int32_t)-1 && @@ -2725,7 +2725,7 @@ sattr_to_vattr(struct nfssattr *sa, struct vattr *vap) if (!NFS2_TIME_OK(sa->sa_atime.tv_sec)) return (EOVERFLOW); #endif - vap->va_mask |= AT_ATIME; + vap->va_mask |= VATTR_ATIME; /* * nfs protocol defines times as unsigned so don't extend sign, * unless sysadmin set nfs_allow_preepoch_time. @@ -2740,7 +2740,7 @@ sattr_to_vattr(struct nfssattr *sa, struct vattr *vap) if (!NFS2_TIME_OK(sa->sa_mtime.tv_sec)) return (EOVERFLOW); #endif - vap->va_mask |= AT_MTIME; + vap->va_mask |= VATTR_MTIME; /* * nfs protocol defines times as unsigned so don't extend sign, * unless sysadmin set nfs_allow_preepoch_time. diff --git a/kernel/fs/nfs/nfs_subr.c b/kernel/fs/nfs/nfs_subr.c index cf4a4d5894..e5e34ab366 100644 --- a/kernel/fs/nfs/nfs_subr.c +++ b/kernel/fs/nfs/nfs_subr.c @@ -1966,23 +1966,23 @@ vattr_to_sattr(struct vattr *vap, struct nfssattr *sa) { uint_t mask = vap->va_mask; - if (!(mask & AT_MODE)) + if (!(mask & VATTR_MODE)) sa->sa_mode = (uint32_t)-1; else sa->sa_mode = vap->va_mode; - if (!(mask & AT_UID)) + if (!(mask & VATTR_UID)) sa->sa_uid = (uint32_t)-1; else sa->sa_uid = (uint32_t)vap->va_uid; - if (!(mask & AT_GID)) + if (!(mask & VATTR_GID)) sa->sa_gid = (uint32_t)-1; else sa->sa_gid = (uint32_t)vap->va_gid; - if (!(mask & AT_SIZE)) + if (!(mask & VATTR_SIZE)) sa->sa_size = (uint32_t)-1; else sa->sa_size = (uint32_t)vap->va_size; - if (!(mask & AT_ATIME)) + if (!(mask & VATTR_ATIME)) sa->sa_atime.tv_sec = sa->sa_atime.tv_usec = (int32_t)-1; else { /* check time validity */ @@ -1992,7 +1992,7 @@ vattr_to_sattr(struct vattr *vap, struct nfssattr *sa) sa->sa_atime.tv_sec = vap->va_atime.tv_sec; sa->sa_atime.tv_usec = vap->va_atime.tv_nsec / 1000; } - if (!(mask & AT_MTIME)) + if (!(mask & VATTR_MTIME)) sa->sa_mtime.tv_sec = sa->sa_mtime.tv_usec = (int32_t)-1; else { /* check time validity */ @@ -2010,31 +2010,31 @@ vattr_to_sattr3(struct vattr *vap, sattr3 *sa) { uint_t mask = vap->va_mask; - if (!(mask & AT_MODE)) + if (!(mask & VATTR_MODE)) sa->mode.set_it = FALSE; else { sa->mode.set_it = TRUE; sa->mode.mode = (mode3)vap->va_mode; } - if (!(mask & AT_UID)) + if (!(mask & VATTR_UID)) sa->uid.set_it = FALSE; else { sa->uid.set_it = TRUE; sa->uid.uid = (uid3)vap->va_uid; } - if (!(mask & AT_GID)) + if (!(mask & VATTR_GID)) sa->gid.set_it = FALSE; else { sa->gid.set_it = TRUE; sa->gid.gid = (gid3)vap->va_gid; } - if (!(mask & AT_SIZE)) + if (!(mask & VATTR_SIZE)) sa->size.set_it = FALSE; else { sa->size.set_it = TRUE; sa->size.size = (size3)vap->va_size; } - if (!(mask & AT_ATIME)) + if (!(mask & VATTR_ATIME)) sa->atime.set_it = DONT_CHANGE; else { /* check time validity */ @@ -2045,7 +2045,7 @@ vattr_to_sattr3(struct vattr *vap, sattr3 *sa) sa->atime.atime.seconds = (uint32)vap->va_atime.tv_sec; sa->atime.atime.nseconds = (uint32)vap->va_atime.tv_nsec; } - if (!(mask & AT_MTIME)) + if (!(mask & VATTR_MTIME)) sa->mtime.set_it = DONT_CHANGE; else { /* check time validity */ @@ -2083,7 +2083,7 @@ setdirgid(vnode_t *dvp, gid_t *gidp, cred_t *cr) rnode_t *rp; struct vattr va; - va.va_mask = AT_MODE | AT_GID; + va.va_mask = VATTR_MODE | VATTR_GID; error = fop_getattr(dvp, &va, 0, cr, NULL); if (error) return (error); @@ -2111,7 +2111,7 @@ setdirmode(vnode_t *dvp, mode_t *omp, cred_t *cr) int error; struct vattr va; - va.va_mask = AT_MODE; + va.va_mask = VATTR_MODE; error = fop_getattr(dvp, &va, 0, cr, NULL); if (error) return (error); diff --git a/kernel/fs/nfs/nfs_vfsops.c b/kernel/fs/nfs/nfs_vfsops.c index ba5075aa2a..343ef1f95a 100644 --- a/kernel/fs/nfs/nfs_vfsops.c +++ b/kernel/fs/nfs/nfs_vfsops.c @@ -1231,7 +1231,7 @@ nfsrootvp(vnode_t **rtvpp, vfs_t *vfsp, struct servinfo *svp, rtvp = makenfsnode((fhandle_t *)svp->sv_fhandle.fh_buf, NULL, vfsp, gethrtime(), cr, NULL, NULL); - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; /* * If the uid is set then set the creds for secure mounts @@ -1614,7 +1614,7 @@ nfs_vget(vfs_t *vfsp, vnode_t **vpp, fid_t *fidp) } if (vp->v_type == VNON) { - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; error = nfsgetattr(vp, &va, CRED()); if (error) { VN_RELE(vp); diff --git a/kernel/fs/nfs/nfs_vnops.c b/kernel/fs/nfs/nfs_vnops.c index 664c6b1e58..65172369c4 100644 --- a/kernel/fs/nfs/nfs_vnops.c +++ b/kernel/fs/nfs/nfs_vnops.c @@ -289,7 +289,7 @@ nfs_open(vnode_t **vpp, int flag, cred_t *cr, caller_context_t *ct) PURGE_ATTRCACHE(vp); error = 0; } else { - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; error = nfs_getattr_otw(vp, &va, cr); } } else @@ -582,7 +582,7 @@ nfs_write(vnode_t *vp, struct uio *uiop, int ioflag, cred_t *cr, return (EINTR); } - va.va_mask = AT_SIZE; + va.va_mask = VATTR_SIZE; error = nfsgetattr(vp, &va, cr); if (error) return (error); @@ -1096,13 +1096,13 @@ nfs_getattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr, rp = VTOR(vp); if (flags & ATTR_HINT) { if (vap->va_mask == - (vap->va_mask & (AT_SIZE | AT_FSID | AT_RDEV))) { + (vap->va_mask & (VATTR_SIZE | VATTR_FSID | VATTR_RDEV))) { mutex_enter(&rp->r_statelock); - if (vap->va_mask | AT_SIZE) + if (vap->va_mask | VATTR_SIZE) vap->va_size = rp->r_size; - if (vap->va_mask | AT_FSID) + if (vap->va_mask | VATTR_FSID) vap->va_fsid = rp->r_attr.va_fsid; - if (vap->va_mask | AT_RDEV) + if (vap->va_mask | VATTR_RDEV) vap->va_rdev = rp->r_attr.va_rdev; mutex_exit(&rp->r_statelock); return (0); @@ -1114,7 +1114,7 @@ nfs_getattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr, * and if there any dirty pages or any outstanding * asynchronous (write) requests for this file. */ - if (vap->va_mask & AT_MTIME) { + if (vap->va_mask & VATTR_MTIME) { if (vn_has_cached_data(vp) && ((rp->r_flags & RDIRTY) || rp->r_awcount > 0)) { mutex_enter(&rp->r_statelock); @@ -1146,10 +1146,10 @@ nfs_setattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr, mask = vap->va_mask; - if (mask & AT_NOSET) + if (mask & VATTR_NOSET) return (EINVAL); - if ((mask & AT_SIZE) && + if ((mask & VATTR_SIZE) && vap->va_type == VREG && vap->va_size > MAXOFF32_T) return (EFBIG); @@ -1157,7 +1157,7 @@ nfs_setattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr, if (nfs_zone() != VTOMI(vp)->mi_zone) return (EIO); - va.va_mask = AT_UID | AT_MODE; + va.va_mask = VATTR_UID | VATTR_MODE; error = nfsgetattr(vp, &va, cr); if (error) @@ -1171,7 +1171,7 @@ nfs_setattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr, error = nfssetattr(vp, vap, flags, cr); - if (error == 0 && (mask & AT_SIZE) && vap->va_size == 0) + if (error == 0 && (mask & VATTR_SIZE) && vap->va_size == 0) vnevent_truncate(vp, ct); return (error); @@ -1236,7 +1236,7 @@ nfssetattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr) * This is an overload of the protocol and should be * documented in the NFS Version 2 protocol specification. */ - if ((mask & AT_MTIME) && !(flags & ATTR_UTIME)) { + if ((mask & VATTR_MTIME) && !(flags & ATTR_UTIME)) { vap->va_mtime.tv_nsec = 1000000000; if (NFS_TIME_T_OK(vap->va_mtime.tv_sec) && NFS_TIME_T_OK(vap->va_atime.tv_sec)) { @@ -1275,7 +1275,7 @@ nfssetattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr) } args.saa_fh = *VTOFH(vp); - va.va_mask = AT_MODE; + va.va_mask = VATTR_MODE; error = nfsgetattr(vp, &va, cr); if (error) return (error); @@ -1298,7 +1298,7 @@ nfssetattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr) * change the access permissions of the file, so purge old * information and start over again. */ - if ((mask & (AT_UID | AT_GID | AT_MODE)) && (mi->mi_flags & MI_ACL)) { + if ((mask & (VATTR_UID | VATTR_GID | VATTR_MODE)) && (mi->mi_flags & MI_ACL)) { (void) nfs_access_purge_rp(rp); if (rp->r_secattr != NULL) { mutex_enter(&rp->r_statelock); @@ -1325,7 +1325,7 @@ nfssetattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr) * back in. A read should be cheaper than a * write. */ - if (mask & AT_SIZE) { + if (mask & VATTR_SIZE) { nfs_invalidate_pages(vp, (vap->va_size & PAGEMASK), cr); } @@ -1351,7 +1351,7 @@ nfssetattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr) * the file size by writing 1 byte at the * offset of the end of the file that we need. */ - if ((mask & AT_SIZE) && + if ((mask & VATTR_SIZE) && ns.ns_attr.na_size < (uint32_t)vap->va_size) { char zb = '\0'; @@ -1364,18 +1364,18 @@ nfssetattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr) * and setgid bits when changing the uid or gid. The * client needs to compensate appropriately. */ - if (mask & (AT_UID | AT_GID)) { + if (mask & (VATTR_UID | VATTR_GID)) { int terror; - va.va_mask = AT_MODE; + va.va_mask = VATTR_MODE; terror = nfsgetattr(vp, &va, cr); if (!terror && - (((mask & AT_MODE) && + (((mask & VATTR_MODE) && va.va_mode != vap->va_mode) || - (!(mask & AT_MODE) && + (!(mask & VATTR_MODE) && va.va_mode != omode))) { - va.va_mask = AT_MODE; - if (mask & AT_MODE) + va.va_mask = VATTR_MODE; + if (mask & VATTR_MODE) va.va_mode = vap->va_mode; else va.va_mode = omode; @@ -1419,7 +1419,7 @@ nfs_access(vnode_t *vp, int mode, int flags, cred_t *cr, caller_context_t *ct) return (error); } - va.va_mask = AT_MODE | AT_UID | AT_GID; + va.va_mask = VATTR_MODE | VATTR_UID | VATTR_GID; error = nfsgetattr(vp, &va, cr); if (error) return (error); @@ -2033,9 +2033,9 @@ nfs_create(vnode_t *dvp, char *nm, struct vattr *va, enum vcexcl exclusive, VN_RELE(tempvp); } if (!(error = fop_access(vp, mode, 0, cr, ct))) { - if ((vattr.va_mask & AT_SIZE) && + if ((vattr.va_mask & VATTR_SIZE) && vp->v_type == VREG) { - vattr.va_mask = AT_SIZE; + vattr.va_mask = VATTR_SIZE; error = nfssetattr(vp, &vattr, 0, cr); if (!error) { @@ -2057,9 +2057,9 @@ nfs_create(vnode_t *dvp, char *nm, struct vattr *va, enum vcexcl exclusive, return (error); } - ASSERT(vattr.va_mask & AT_TYPE); + ASSERT(vattr.va_mask & VATTR_TYPE); if (vattr.va_type == VREG) { - ASSERT(vattr.va_mask & AT_MODE); + ASSERT(vattr.va_mask & VATTR_MODE); if (MANDMODE(vattr.va_mode)) { nfs_rw_exit(&drp->r_rwlock); return (EACCES); @@ -2080,7 +2080,7 @@ nfs_create(vnode_t *dvp, char *nm, struct vattr *va, enum vcexcl exclusive, nfs_rw_exit(&drp->r_rwlock); return (error); } - vattr.va_mask |= AT_GID; + vattr.va_mask |= VATTR_GID; /* * This is a completely gross hack to make mknod @@ -2114,19 +2114,19 @@ nfs_create(vnode_t *dvp, char *nm, struct vattr *va, enum vcexcl exclusive, else vattr.va_size = (uoff_t)nfsv2_cmpdev(d); - vattr.va_mask |= AT_MODE|AT_SIZE; + vattr.va_mask |= VATTR_MODE|VATTR_SIZE; } else if (vattr.va_type == VFIFO) { vattr.va_mode |= IFCHR; /* xtra kludge for namedpipe */ vattr.va_size = (uoff_t)NFS_FIFO_DEV; /* blech */ - vattr.va_mask |= AT_MODE|AT_SIZE; + vattr.va_mask |= VATTR_MODE|VATTR_SIZE; } else if (vattr.va_type == VSOCK) { vattr.va_mode |= IFSOCK; /* - * To avoid triggering bugs in the servers set AT_SIZE + * To avoid triggering bugs in the servers set VATTR_SIZE * (all other RFS_CREATE calls set this). */ vattr.va_size = 0; - vattr.va_mask |= AT_MODE|AT_SIZE; + vattr.va_mask |= VATTR_MODE|VATTR_SIZE; } args.ca_sa = &args.ca_sa_buf; @@ -2185,7 +2185,7 @@ nfs_create(vnode_t *dvp, char *nm, struct vattr *va, enum vcexcl exclusive, * any sleep over it). */ if (vattr.va_gid != rp->r_attr.va_gid) { - vattr.va_mask = AT_GID; + vattr.va_mask = VATTR_GID; (void) nfssetattr(vp, &vattr, 0, cr); } @@ -2730,7 +2730,7 @@ nfs_mkdir(vnode_t *dvp, char *nm, struct vattr *va, vnode_t **vpp, cred_t *cr, error = setdirmode(dvp, &va->va_mode, cr); if (error) return (error); - va->va_mask |= AT_MODE|AT_GID; + va->va_mask |= VATTR_MODE|VATTR_GID; args.ca_sa = &args.ca_sa_buf; error = vattr_to_sattr(va, args.ca_sa); @@ -2778,7 +2778,7 @@ nfs_mkdir(vnode_t *dvp, char *nm, struct vattr *va, vnode_t **vpp, cred_t *cr, * any sleep over it). */ if (va->va_gid != VTOR(*vpp)->r_attr.va_gid) { - va->va_mask = AT_GID; + va->va_mask = VATTR_GID; (void) nfssetattr(*vpp, va, 0, cr); } } else { @@ -4326,7 +4326,7 @@ nfs_map(vnode_t *vp, offset_t off, struct as *as, caddr_t *addrp, * is timed out and if it is, then an over the wire getattr * will be issued. */ - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; if (vn_has_cached_data(vp) && !(VTOMI(vp)->mi_flags & MI_NOCTO) && !vn_is_readonly(vp)) error = nfs_getattr_otw(vp, &va, cr); @@ -4609,11 +4609,11 @@ nfs_space(vnode_t *vp, int cmd, struct flock64 *bfp, int flag, * mtime if we truncate the file to its * previous size. */ - va.va_mask = AT_SIZE; + va.va_mask = VATTR_SIZE; error = nfsgetattr(vp, &va, cr); if (error || va.va_size == bfp->l_start) return (error); - va.va_mask = AT_SIZE; + va.va_mask = VATTR_SIZE; va.va_size = bfp->l_start; error = nfssetattr(vp, &va, 0, cr); diff --git a/kernel/fs/pcfs/pc_dir.c b/kernel/fs/pcfs/pc_dir.c index e4c6a4fd1e..f927a4c198 100644 --- a/kernel/fs/pcfs/pc_dir.c +++ b/kernel/fs/pcfs/pc_dir.c @@ -281,7 +281,7 @@ pc_makedirentry(struct pcnode *dp, struct pcdir *direntries, struct buf *bp = NULL; timestruc_t now; - if (vap != NULL && vap->va_mask & (AT_ATIME|AT_MTIME)) + if (vap != NULL && vap->va_mask & (VATTR_ATIME|VATTR_MTIME)) return (EOPNOTSUPP); ep = &direntries[ndirentries - 1]; diff --git a/kernel/fs/pcfs/pc_vnops.c b/kernel/fs/pcfs/pc_vnops.c index 0293a581a6..c3f30c89dc 100644 --- a/kernel/fs/pcfs/pc_vnops.c +++ b/kernel/fs/pcfs/pc_vnops.c @@ -712,7 +712,7 @@ pcfs_setattr( /* * cannot set these attributes */ - if (mask & (AT_NOSET | AT_UID | AT_GID)) { + if (mask & (VATTR_NOSET | VATTR_UID | VATTR_GID)) { return (EINVAL); } /* @@ -729,7 +729,7 @@ pcfs_setattr( */ /* can't do some ops on directories anyway */ if ((vp->v_type == VDIR) && - (mask & AT_SIZE)) { + (mask & VATTR_SIZE)) { return (EINVAL); } @@ -754,7 +754,7 @@ pcfs_setattr( * If nobody has write permission, file is marked readonly. * Otherwise file is writable by anyone. */ - if ((mask & AT_MODE) && (vap->va_mode != (mode_t)-1)) { + if ((mask & VATTR_MODE) && (vap->va_mode != (mode_t)-1)) { if ((vap->va_mode & 0222) == 0) pcp->pc_entry.pcd_attr |= PCA_RDONLY; else @@ -764,7 +764,7 @@ pcfs_setattr( /* * Truncate file. Must have write permission. */ - if ((mask & AT_SIZE) && (vap->va_size != (uoff_t)-1)) { + if ((mask & VATTR_SIZE) && (vap->va_size != (uoff_t)-1)) { if (pcp->pc_entry.pcd_attr & PCA_RDONLY) { error = EACCES; goto out; @@ -784,7 +784,7 @@ pcfs_setattr( /* * Change file modified times. */ - if (mask & (AT_MTIME | AT_CTIME)) { + if (mask & (VATTR_MTIME | VATTR_CTIME)) { /* * If SysV-compatible option to set access and * modified times if privileged, owner, or write access, @@ -810,7 +810,7 @@ pcfs_setattr( /* * Change file access times. */ - if (mask & AT_ATIME) { + if (mask & VATTR_ATIME) { /* * If SysV-compatible option to set access and * modified times if privileged, owner, or write access, @@ -1101,7 +1101,7 @@ pcfs_create( } if (error) { VN_RELE(PCTOV(pcp)); - } else if ((vp->v_type == VREG) && (vap->va_mask & AT_SIZE) && + } else if ((vp->v_type == VREG) && (vap->va_mask & VATTR_SIZE) && (vap->va_size == 0)) { error = pc_truncate(pcp, 0L); if (error) { @@ -2027,7 +2027,7 @@ pcfs_space( */ if (bfp->l_len != 0) return (EINVAL); - vattr.va_mask = AT_SIZE; + vattr.va_mask = VATTR_SIZE; vattr.va_size = bfp->l_start; error = fop_setattr(vp, (vattr_t *)&vattr, 0, cr, ct); } diff --git a/kernel/fs/portfs/port_fop.c b/kernel/fs/portfs/port_fop.c index bd944b2116..1f0376b7f8 100644 --- a/kernel/fs/portfs/port_fop.c +++ b/kernel/fs/portfs/port_fop.c @@ -787,7 +787,7 @@ port_check_timestamp(portfop_cache_t *pfcp, vnode_t *vp, vnode_t *dvp, /* * If time stamps are specified, get attributes and compare. */ - vatt.va_mask = AT_ATIME|AT_MTIME|AT_CTIME; + vatt.va_mask = VATTR_ATIME|VATTR_MTIME|VATTR_CTIME; if (get_udatamodel() == DATAMODEL_NATIVE) { fobj = (file_obj_t *)objptr; if (fobj->fo_atime.tv_sec || fobj->fo_atime.tv_nsec || @@ -2046,7 +2046,7 @@ port_fop_unmount(fsemarg_t *vf, int flag, cred_t *cr) /* * ------------------------------file op hooks-------------------------- - * The O_TRUNC operation is caught with the fop_setattr(AT_SIZE) call. + * The O_TRUNC operation is caught with the fop_setattr(VATTR_SIZE) call. */ static int port_fop_open(femarg_t *vf, int mode, cred_t *cr, caller_context_t *ct) @@ -2099,7 +2099,7 @@ port_fop_read(femarg_t *vf, struct uio *uiop, int ioflag, struct cred *cr, /* - * AT_SIZE - is for the open(O_TRUNC) case. + * VATTR_SIZE - is for the open(O_TRUNC) case. */ int port_fop_setattr(femarg_t *vf, vattr_t *vap, int flags, cred_t *cr, @@ -2110,13 +2110,13 @@ port_fop_setattr(femarg_t *vf, vattr_t *vap, int flags, cred_t *cr, int events = 0; retval = vnext_setattr(vf, vap, flags, cr, ct); - if (vap->va_mask & AT_SIZE) { + if (vap->va_mask & VATTR_SIZE) { events |= FOP_FILE_TRUNC; } - if (vap->va_mask & (AT_SIZE|AT_MTIME)) { + if (vap->va_mask & (VATTR_SIZE|VATTR_MTIME)) { events |= FOP_FILE_SETATTR_MTIME; } - if (vap->va_mask & AT_ATIME) { + if (vap->va_mask & VATTR_ATIME) { events |= FOP_FILE_SETATTR_ATIME; } events |= FOP_FILE_SETATTR_CTIME; @@ -2140,14 +2140,14 @@ port_fop_create(femarg_t *vf, char *name, vattr_t *vap, vcexcl_t excl, * modification time of the directory to determine if the * file was actually created. */ - vatt.va_mask = AT_ATIME|AT_MTIME|AT_CTIME; + vatt.va_mask = VATTR_ATIME|VATTR_MTIME|VATTR_CTIME; if (fop_getattr(vp, &vatt, 0, CRED(), ct)) { got = 0; } retval = vnext_create(vf, name, vap, excl, mode, vpp, cr, flag, ct, vsecp); - vatt1.va_mask = AT_ATIME|AT_MTIME|AT_CTIME; + vatt1.va_mask = VATTR_ATIME|VATTR_MTIME|VATTR_CTIME; if (got && !fop_getattr(vp, &vatt1, 0, CRED(), ct)) { if ((vatt1.va_mtime.tv_sec > vatt.va_mtime.tv_sec || (vatt1.va_mtime.tv_sec = vatt.va_mtime.tv_sec && diff --git a/kernel/fs/proc/prsubr.c b/kernel/fs/proc/prsubr.c index 9c688dfe86..b73e0ce179 100644 --- a/kernel/fs/proc/prsubr.c +++ b/kernel/fs/proc/prsubr.c @@ -1695,7 +1695,7 @@ prgetmap(proc_t *p, int reserved, list_t *iolhead) /* * Manufacture a filename for the "object" directory. */ - vattr.va_mask = AT_FSID|AT_NODEID; + vattr.va_mask = VATTR_FSID|VATTR_NODEID; if (seg->s_ops == &segvn_ops && segop_getvp(seg, saddr, &vp) == 0 && vp != NULL && vp->v_type == VREG && @@ -1811,7 +1811,7 @@ prgetmap32(proc_t *p, int reserved, list_t *iolhead) /* * Manufacture a filename for the "object" directory. */ - vattr.va_mask = AT_FSID|AT_NODEID; + vattr.va_mask = VATTR_FSID|VATTR_NODEID; if (seg->s_ops == &segvn_ops && segop_getvp(seg, saddr, &vp) == 0 && vp != NULL && vp->v_type == VREG && @@ -2026,7 +2026,7 @@ again: /* * Manufacture a filename for the "object" directory. */ - vattr.va_mask = AT_FSID|AT_NODEID; + vattr.va_mask = VATTR_FSID|VATTR_NODEID; if (seg->s_ops == &segvn_ops && segop_getvp(seg, saddr, &vp) == 0 && vp != NULL && vp->v_type == VREG && @@ -2177,7 +2177,7 @@ again: /* * Manufacture a filename for the "object" directory. */ - vattr.va_mask = AT_FSID|AT_NODEID; + vattr.va_mask = VATTR_FSID|VATTR_NODEID; if (seg->s_ops == &segvn_ops && segop_getvp(seg, saddr, &vp) == 0 && vp != NULL && vp->v_type == VREG && @@ -3816,7 +3816,7 @@ pr_getsegsize(struct seg *seg, int reserved) vattr_t vattr; vnode_t *vp; - vattr.va_mask = AT_SIZE; + vattr.va_mask = VATTR_SIZE; if (segop_getvp(seg, seg->s_base, &vp) == 0 && vp != NULL && vp->v_type == VREG && @@ -4122,7 +4122,7 @@ prgetxmap(proc_t *p, list_t *iolhead) * Manufacture a filename for the "object" dir. */ mp->pr_dev = PRNODEV; - vattr.va_mask = AT_FSID|AT_NODEID; + vattr.va_mask = VATTR_FSID|VATTR_NODEID; if (seg->s_ops == &segvn_ops && segop_getvp(seg, saddr, &vp) == 0 && vp != NULL && vp->v_type == VREG && @@ -4323,7 +4323,7 @@ prgetxmap32(proc_t *p, list_t *iolhead) * Manufacture a filename for the "object" dir. */ mp->pr_dev = PRNODEV32; - vattr.va_mask = AT_FSID|AT_NODEID; + vattr.va_mask = VATTR_FSID|VATTR_NODEID; if (seg->s_ops == &segvn_ops && segop_getvp(seg, saddr, &vp) == 0 && vp != NULL && vp->v_type == VREG && diff --git a/kernel/fs/proc/prvnops.c b/kernel/fs/proc/prvnops.c index 0c3b1d3ba2..ee85c6f972 100644 --- a/kernel/fs/proc/prvnops.c +++ b/kernel/fs/proc/prvnops.c @@ -3288,7 +3288,7 @@ prcreate(vnode_t *dp, char *comp, vattr_t *vap, vcexcl_t excl, error = EEXIST; } else if ((error = praccess(*vpp, mode, 0, cr, ct)) == 0) { /* Before proceeding, handle O_TRUNC if necessary. */ - if (vap->va_mask & AT_SIZE) { + if (vap->va_mask & VATTR_SIZE) { vnode_t *vp = *vpp; if (vp->v_type == VDIR) { @@ -3306,7 +3306,7 @@ prcreate(vnode_t *dp, char *comp, vattr_t *vap, vcexcl_t excl, vp = VTOP(vp)->pr_realvp; mask = vap->va_mask; - vap->va_mask = AT_SIZE; + vap->va_mask = VATTR_SIZE; error = fop_setattr(vp, vap, 0, cr, ct); vap->va_mask = mask; } @@ -3597,7 +3597,7 @@ pr_lookup_objectdir(vnode_t *dp, char *comp) /* * Manufacture a filename for the "object" directory. */ - vattr.va_mask = AT_FSID|AT_NODEID; + vattr.va_mask = VATTR_FSID|VATTR_NODEID; if (seg->s_ops == &segvn_ops && segop_getvp(seg, seg->s_base, &vp) == 0 && vp != NULL && vp->v_type == VREG && @@ -4042,7 +4042,7 @@ pr_lookup_pathdir(vnode_t *dp, char *comp) * Manufacture a filename for the * "object" directory. */ - vattr.va_mask = AT_FSID|AT_NODEID; + vattr.va_mask = VATTR_FSID|VATTR_NODEID; if (seg->s_ops == &segvn_ops && segop_getvp(seg, seg->s_base, &vp) == 0 && @@ -4740,7 +4740,7 @@ rebuild_objdir(struct as *as) /* fill in the new directory with desired entries */ nentries = 0; do { - vattr.va_mask = AT_FSID|AT_NODEID; + vattr.va_mask = VATTR_FSID|VATTR_NODEID; if (seg->s_ops == &segvn_ops && segop_getvp(seg, seg->s_base, &vp) == 0 && vp != NULL && vp->v_type == VREG && @@ -4898,11 +4898,11 @@ pr_readdir_objectdir(prnode_t *pnp, uio_t *uiop, int *eofp) /* * Find next object. */ - vattr.va_mask = AT_FSID | AT_NODEID; + vattr.va_mask = VATTR_FSID | VATTR_NODEID; while (n < objdirsize && (((vp = obj_entry(as, n)) == NULL) || (fop_getattr(vp, &vattr, 0, CRED(), NULL) != 0))) { - vattr.va_mask = AT_FSID | AT_NODEID; + vattr.va_mask = VATTR_FSID | VATTR_NODEID; n++; } @@ -5250,7 +5250,7 @@ pr_readdir_pathdir(prnode_t *pnp, uio_t *uiop, int *eofp) obj = idx - 4 - fddirsize; if ((vp = obj_entry(as, obj)) == NULL) continue; - vattr.va_mask = AT_FSID|AT_NODEID; + vattr.va_mask = VATTR_FSID|VATTR_NODEID; if (fop_getattr(vp, &vattr, 0, CRED(), NULL) != 0) continue; if (vp == p->p_exec) diff --git a/kernel/fs/sockfs/sockcommon_vnops.c b/kernel/fs/sockfs/sockcommon_vnops.c index 33a19dc93a..fd4c635ebd 100644 --- a/kernel/fs/sockfs/sockcommon_vnops.c +++ b/kernel/fs/sockfs/sockcommon_vnops.c @@ -372,9 +372,9 @@ socket_vop_setattr(struct vnode *vp, struct vattr *vap, int flags, sotpi_info_t *sti = SOTOTPI(so); mutex_enter(&so->so_lock); - if (vap->va_mask & AT_ATIME) + if (vap->va_mask & VATTR_ATIME) sti->sti_atime = vap->va_atime.tv_sec; - if (vap->va_mask & AT_MTIME) { + if (vap->va_mask & VATTR_MTIME) { sti->sti_mtime = vap->va_mtime.tv_sec; sti->sti_ctime = gethrestime_sec(); } diff --git a/kernel/fs/sockfs/socksyscalls.c b/kernel/fs/sockfs/socksyscalls.c index 2cd6a132f0..45ada12ca2 100644 --- a/kernel/fs/sockfs/socksyscalls.c +++ b/kernel/fs/sockfs/socksyscalls.c @@ -2595,7 +2595,7 @@ snf_segmap(file_t *fp, vnode_t *fvp, uoff_t fileoff, uoff_t total_size, goto done; (void) fop_rwlock(fvp, V_WRITELOCK_FALSE, NULL); - va.va_mask = AT_SIZE; + va.va_mask = VATTR_SIZE; error = fop_getattr(fvp, &va, 0, kcred, NULL); if (error) break; @@ -2743,7 +2743,7 @@ snf_cache(file_t *fp, vnode_t *fvp, uoff_t fileoff, uoff_t size, fileoff += iosize; (void) fop_rwlock(fvp, V_WRITELOCK_FALSE, NULL); - va.va_mask = AT_SIZE; + va.va_mask = VATTR_SIZE; error = fop_getattr(fvp, &va, 0, kcred, NULL); if (error) break; @@ -2816,7 +2816,7 @@ sosendfile64(file_t *fp, file_t *rfp, const struct ksendfilevec64 *sfv, * from changing underneath. */ (void) fop_rwlock(fvp, V_WRITELOCK_FALSE, NULL); - va.va_mask = AT_SIZE; + va.va_mask = VATTR_SIZE; error = fop_getattr(fvp, &va, 0, kcred, NULL); va_size = va.va_size; if ((error != 0) || (va_size == 0) || (sfv_off >= va_size)) { diff --git a/kernel/fs/sockfs/socktpi.c b/kernel/fs/sockfs/socktpi.c index 0936fd4acc..ef3eed4240 100644 --- a/kernel/fs/sockfs/socktpi.c +++ b/kernel/fs/sockfs/socktpi.c @@ -899,7 +899,7 @@ sotpi_bindlisten(struct sonode *so, struct sockaddr *name, } vattr.va_type = VSOCK; vattr.va_mode = 0777 & ~PTOU(curproc)->u_cmask; - vattr.va_mask = AT_TYPE|AT_MODE; + vattr.va_mask = VATTR_TYPE|VATTR_MODE; /* NOTE: holding so_lock */ error = vn_create(soun->sun_path, UIO_SYSSPACE, &vattr, EXCL, 0, &vp, CRMKNOD, 0, 0); diff --git a/kernel/fs/specfs/specsubr.c b/kernel/fs/specfs/specsubr.c index 0358622216..e75796ccf8 100644 --- a/kernel/fs/specfs/specsubr.c +++ b/kernel/fs/specfs/specsubr.c @@ -142,7 +142,7 @@ specvp( * this operation may block. Unfortunately, it may not have * been required if the snode is in the cache. */ - va.va_mask = AT_FSID | AT_TIMES; + va.va_mask = VATTR_FSID | VATTR_TIMES; rc = fop_getattr(vp, &va, 0, cr, NULL); /* XXX may block! */ mutex_enter(&stable_lock); diff --git a/kernel/fs/specfs/specvnops.c b/kernel/fs/specfs/specvnops.c index 85649e9f5e..d7e742cb3f 100644 --- a/kernel/fs/specfs/specvnops.c +++ b/kernel/fs/specfs/specvnops.c @@ -1386,12 +1386,12 @@ spec_setattr( if (S_ISFENCED(sp)) return (ENXIO); - if (vp->v_type == VCHR && vp->v_stream && (vap->va_mask & AT_SIZE)) { + if (vp->v_type == VCHR && vp->v_stream && (vap->va_mask & VATTR_SIZE)) { /* * 1135080: O_TRUNC should have no effect on * named pipes and terminal devices. */ - ASSERT(vap->va_mask == AT_SIZE); + ASSERT(vap->va_mask == VATTR_SIZE); return (0); } @@ -1404,9 +1404,9 @@ spec_setattr( * If times were changed, update snode. */ mutex_enter(&sp->s_lock); - if (vap->va_mask & AT_ATIME) + if (vap->va_mask & VATTR_ATIME) sp->s_atime = vap->va_atime.tv_sec; - if (vap->va_mask & AT_MTIME) { + if (vap->va_mask & VATTR_MTIME) { sp->s_mtime = vap->va_mtime.tv_sec; sp->s_ctime = gethrestime_sec(); } @@ -1535,7 +1535,7 @@ spec_fsync( if (realvp == NULL) return (0); - vatmp.va_mask = AT_ATIME|AT_MTIME; + vatmp.va_mask = VATTR_ATIME|VATTR_MTIME; if (fop_getattr(realvp, &vatmp, 0, cr, ct) == 0) { mutex_enter(&sp->s_lock); @@ -1553,7 +1553,7 @@ spec_fsync( } mutex_exit(&sp->s_lock); - va.va_mask = AT_ATIME|AT_MTIME; + va.va_mask = VATTR_ATIME|VATTR_MTIME; (void) fop_setattr(realvp, &va, 0, cr, ct); } (void) fop_fsync(realvp, syncflag, cr, ct); @@ -1606,7 +1606,7 @@ spec_inactive(struct vnode *vp, struct cred *cr, caller_context_t *ct) mutex_enter(&sp->s_lock); sp->s_flag &= ~(SACC|SUPD|SCHG); mutex_exit(&sp->s_lock); - vatmp.va_mask = AT_ATIME|AT_MTIME; + vatmp.va_mask = VATTR_ATIME|VATTR_MTIME; /* * The user may not own the device, but we * want to update the attributes anyway. @@ -1625,7 +1625,7 @@ spec_inactive(struct vnode *vp, struct cred *cr, caller_context_t *ct) va.va_mtime.tv_nsec = 0; } - va.va_mask = AT_ATIME|AT_MTIME; + va.va_mask = VATTR_ATIME|VATTR_MTIME; (void) fop_setattr(rvp, &va, 0, kcred, ct); } } diff --git a/kernel/fs/tmpfs/tmp_dir.c b/kernel/fs/tmpfs/tmp_dir.c index 4a611aa6f7..663326b72f 100644 --- a/kernel/fs/tmpfs/tmp_dir.c +++ b/kernel/fs/tmpfs/tmp_dir.c @@ -1018,8 +1018,8 @@ tdirmaketnode( ASSERT(va != NULL); ASSERT(op == DE_CREATE || op == DE_MKDIR); - if (((va->va_mask & AT_ATIME) && TIMESPEC_OVERFLOW(&va->va_atime)) || - ((va->va_mask & AT_MTIME) && TIMESPEC_OVERFLOW(&va->va_mtime))) + if (((va->va_mask & VATTR_ATIME) && TIMESPEC_OVERFLOW(&va->va_atime)) || + ((va->va_mask & VATTR_MTIME) && TIMESPEC_OVERFLOW(&va->va_mtime))) return (EOVERFLOW); type = va->va_type; tp = tmp_memalloc(sizeof (struct tmpnode), TMP_MUSTHAVE); @@ -1051,7 +1051,7 @@ tdirmaketnode( * then use the process's gid. * 3) Otherwise, set the group-id to the gid of the parent directory. */ - if ((va->va_mask & AT_GID) && + if ((va->va_mask & VATTR_GID) && ((va->va_gid == dir->tn_gid) || groupmember(va->va_gid, cred) || secpolicy_vnode_create_gid(cred) == 0)) { /* @@ -1079,9 +1079,9 @@ tdirmaketnode( tp->tn_mode &= ~VSGID; } - if (va->va_mask & AT_ATIME) + if (va->va_mask & VATTR_ATIME) tp->tn_atime = va->va_atime; - if (va->va_mask & AT_MTIME) + if (va->va_mask & VATTR_MTIME) tp->tn_mtime = va->va_mtime; if (op == DE_MKDIR) diff --git a/kernel/fs/tmpfs/tmp_vfsops.c b/kernel/fs/tmpfs/tmp_vfsops.c index e15614a8fb..e304522904 100644 --- a/kernel/fs/tmpfs/tmp_vfsops.c +++ b/kernel/fs/tmpfs/tmp_vfsops.c @@ -350,7 +350,7 @@ tmp_mount(vfs_t *vfsp, vnode_t *mvp, struct mounta *uap, cred_t *cr) /* * Get the mode, uid, and gid from the underlying mount point. */ - rattr.va_mask = AT_MODE|AT_UID|AT_GID; /* Hint to getattr */ + rattr.va_mask = VATTR_MODE|VATTR_UID|VATTR_GID; /* Hint to getattr */ got_attrs = fop_getattr(mvp, &rattr, 0, cr, NULL); rw_enter(&tp->tn_rwlock, RW_WRITER); diff --git a/kernel/fs/tmpfs/tmp_vnops.c b/kernel/fs/tmpfs/tmp_vnops.c index c925e21cf2..3bc3eaa429 100644 --- a/kernel/fs/tmpfs/tmp_vnops.c +++ b/kernel/fs/tmpfs/tmp_vnops.c @@ -680,7 +680,7 @@ tmp_getattr( if (tp->tn_uid == UID_NOBODY || tp->tn_gid == GID_NOBODY) { mutex_exit(&tp->tn_tlock); bzero(&va, sizeof (struct vattr)); - va.va_mask = AT_UID|AT_GID; + va.va_mask = VATTR_UID|VATTR_GID; attrs = fop_getattr(mvp, &va, 0, cred, ct); } else { mutex_exit(&tp->tn_tlock); @@ -733,7 +733,7 @@ tmp_setattr( /* * Cannot set these attributes */ - if ((vap->va_mask & AT_NOSET) || (vap->va_mask & AT_XVATTR)) + if ((vap->va_mask & VATTR_NOSET) || (vap->va_mask & VATTR_XVATTR)) return (EINVAL); mutex_enter(&tp->tn_tlock); @@ -751,24 +751,24 @@ tmp_setattr( mask = vap->va_mask; - if (mask & AT_MODE) { + if (mask & VATTR_MODE) { get->va_mode &= S_IFMT; get->va_mode |= vap->va_mode & ~S_IFMT; } - if (mask & AT_UID) + if (mask & VATTR_UID) get->va_uid = vap->va_uid; - if (mask & AT_GID) + if (mask & VATTR_GID) get->va_gid = vap->va_gid; - if (mask & AT_ATIME) + if (mask & VATTR_ATIME) get->va_atime = vap->va_atime; - if (mask & AT_MTIME) + if (mask & VATTR_MTIME) get->va_mtime = vap->va_mtime; - if (mask & (AT_UID | AT_GID | AT_MODE | AT_MTIME)) + if (mask & (VATTR_UID | VATTR_GID | VATTR_MODE | VATTR_MTIME)) gethrestime(&tp->tn_ctime); - if (mask & AT_SIZE) { + if (mask & VATTR_SIZE) { ASSERT(vp->v_type != VDIR); /* Don't support large files. */ @@ -1009,7 +1009,7 @@ again: return (error); } *vpp = TNTOV(oldtp); - if ((*vpp)->v_type == VREG && (vap->va_mask & AT_SIZE) && + if ((*vpp)->v_type == VREG && (vap->va_mask & VATTR_SIZE) && vap->va_size == 0) { rw_enter(&oldtp->tn_contents, RW_WRITER); (void) tmpnode_trunc(tm, oldtp, 0); diff --git a/kernel/fs/udfs/udf_alloc.c b/kernel/fs/udfs/udf_alloc.c index 78fa5dc83a..bc47187c20 100644 --- a/kernel/fs/udfs/udf_alloc.c +++ b/kernel/fs/udfs/udf_alloc.c @@ -1002,8 +1002,8 @@ ud_ialloc(struct ud_inode *pip, ud_printf("ud_ialloc\n"); - if (((vap->va_mask & AT_ATIME) && TIMESPEC_OVERFLOW(&vap->va_atime)) || - ((vap->va_mask & AT_MTIME) && TIMESPEC_OVERFLOW(&vap->va_mtime))) + if (((vap->va_mask & VATTR_ATIME) && TIMESPEC_OVERFLOW(&vap->va_atime)) || + ((vap->va_mask & VATTR_MTIME) && TIMESPEC_OVERFLOW(&vap->va_mtime))) return (EOVERFLOW); udf_vfsp = pip->i_udf; @@ -1039,7 +1039,7 @@ ud_ialloc(struct ud_inode *pip, * then use the process's gid. * 3) Otherwise, set the group-id to the gid of the parent directory. */ - if ((vap->va_mask & AT_GID) && + if ((vap->va_mask & VATTR_GID) && ((vap->va_gid == pip->i_gid) || groupmember(vap->va_gid, cr) || secpolicy_vnode_create_gid(cr) == 0)) { /* @@ -1087,12 +1087,12 @@ ud_ialloc(struct ud_inode *pip, gethrestime(&now); time.tv_sec = now.tv_sec; time.tv_nsec = now.tv_nsec; - if (vap->va_mask & AT_ATIME) { + if (vap->va_mask & VATTR_ATIME) { TIMESPEC_TO_TIMESPEC32(&settime, &vap->va_atime) ud_utime2dtime(&settime, &fe->fe_acc_time); } else ud_utime2dtime(&time, &fe->fe_acc_time); - if (vap->va_mask & AT_MTIME) { + if (vap->va_mask & VATTR_MTIME) { TIMESPEC_TO_TIMESPEC32(&settime, &vap->va_mtime) ud_utime2dtime(&settime, &fe->fe_mod_time); } else diff --git a/kernel/fs/udfs/udf_dir.c b/kernel/fs/udfs/udf_dir.c index abed230199..d4e1f0ae88 100644 --- a/kernel/fs/udfs/udf_dir.c +++ b/kernel/fs/udfs/udf_dir.c @@ -1233,7 +1233,7 @@ ud_dirmakeinode(struct ud_inode *tdp, struct ud_inode **ipp, ASSERT(vap != NULL); ASSERT(op == DE_CREATE || op == DE_MKDIR); - ASSERT((vap->va_mask & (AT_TYPE|AT_MODE)) == (AT_TYPE|AT_MODE)); + ASSERT((vap->va_mask & (VATTR_TYPE|VATTR_MODE)) == (VATTR_TYPE|VATTR_MODE)); ASSERT(RW_WRITE_HELD(&tdp->i_rwlock)); /* @@ -1257,9 +1257,9 @@ ud_dirmakeinode(struct ud_inode *tdp, struct ud_inode **ipp, * mtime fields. They were set from the passed in attributes in * ud_ialloc(). */ - if (vap->va_mask & AT_ATIME) + if (vap->va_mask & VATTR_ATIME) ip->i_flag &= ~IACC; - if (vap->va_mask & AT_MTIME) + if (vap->va_mask & VATTR_MTIME) ip->i_flag &= ~IUPD; /* * push inode before it's name appears in a directory diff --git a/kernel/fs/udfs/udf_vnops.c b/kernel/fs/udfs/udf_vnops.c index f20d8283dc..49148cb6f7 100644 --- a/kernel/fs/udfs/udf_vnops.c +++ b/kernel/fs/udfs/udf_vnops.c @@ -421,7 +421,7 @@ udf_getattr( ud_printf("udf_getattr\n"); - if (vap->va_mask == AT_SIZE) { + if (vap->va_mask == VATTR_SIZE) { /* * for performance, if only the size is requested don't bother * with anything else. @@ -511,7 +511,7 @@ udf_setattr( /* * Cannot set these attributes */ - if (mask & AT_NOSET) { + if (mask & VATTR_NOSET) { return (EINVAL); } @@ -529,18 +529,18 @@ udf_setattr( /* * Change file access modes. */ - if (mask & AT_MODE) { + if (mask & VATTR_MODE) { ip->i_perm = VA2UD_PERM(vap->va_mode); ip->i_char = vap->va_mode & (VSUID | VSGID | VSVTX); mutex_enter(&ip->i_tlock); ip->i_flag |= ICHG; mutex_exit(&ip->i_tlock); } - if (mask & (AT_UID|AT_GID)) { - if (mask & AT_UID) { + if (mask & (VATTR_UID|VATTR_GID)) { + if (mask & VATTR_UID) { ip->i_uid = vap->va_uid; } - if (mask & AT_GID) { + if (mask & VATTR_GID) { ip->i_gid = vap->va_gid; } mutex_enter(&ip->i_tlock); @@ -550,7 +550,7 @@ udf_setattr( /* * Truncate file. Must have write permission and not be a directory. */ - if (mask & AT_SIZE) { + if (mask & VATTR_SIZE) { if (vp->v_type == VDIR) { error = EISDIR; goto update_inode; @@ -572,14 +572,14 @@ udf_setattr( /* * Change file access or modified times. */ - if (mask & (AT_ATIME|AT_MTIME)) { + if (mask & (VATTR_ATIME|VATTR_MTIME)) { mutex_enter(&ip->i_tlock); - if (mask & AT_ATIME) { + if (mask & VATTR_ATIME) { ip->i_atime.tv_sec = vap->va_atime.tv_sec; ip->i_atime.tv_nsec = vap->va_atime.tv_nsec; ip->i_flag &= ~IACC; } - if (mask & AT_MTIME) { + if (mask & VATTR_MTIME) { ip->i_mtime.tv_sec = vap->va_mtime.tv_sec; ip->i_mtime.tv_nsec = vap->va_mtime.tv_nsec; gethrestime(&now); @@ -771,7 +771,7 @@ udf_create( VN_RELE(ITOV(ip)); goto out; } else if ((ip->i_type == VREG) && - (vap->va_mask & AT_SIZE) && vap->va_size == 0) { + (vap->va_mask & VATTR_SIZE) && vap->va_size == 0) { /* * Truncate regular files, if requested by caller. * Grab i_rwlock to make sure no one else is @@ -1052,7 +1052,7 @@ udf_mkdir( struct ud_inode *ip; struct ud_inode *xip; - ASSERT((vap->va_mask & (AT_TYPE|AT_MODE)) == (AT_TYPE|AT_MODE)); + ASSERT((vap->va_mask & (VATTR_TYPE|VATTR_MODE)) == (VATTR_TYPE|VATTR_MODE)); ud_printf("udf_mkdir\n"); diff --git a/kernel/fs/ufs/ufs_acl.c b/kernel/fs/ufs/ufs_acl.c index 88b3e52f6f..5be07687d0 100644 --- a/kernel/fs/ufs/ufs_acl.c +++ b/kernel/fs/ufs/ufs_acl.c @@ -1452,7 +1452,7 @@ ufs_acl_setattr(struct inode *ip, struct vattr *vap, cred_t *cr) ASSERT(RW_WRITE_HELD(&ip->i_contents)); - if (!(mask & (AT_MODE|AT_UID|AT_GID))) + if (!(mask & (VATTR_MODE|VATTR_UID|VATTR_GID))) return (0); /* @@ -1476,7 +1476,7 @@ ufs_acl_setattr(struct inode *ip, struct vattr *vap, cred_t *cr) * an ACL mask exists, chmod(2) must set the acl mask (NOT the * group_obj permissions) to the requested group permissions. */ - if (mask & AT_MODE) { + if (mask & VATTR_MODE) { sp->aowner->acl_ic_perm = (o_mode_t)(ip->i_mode & 0700) >> 6; if (sp->aclass.acl_ismask) sp->aclass.acl_maskbits = @@ -1487,12 +1487,12 @@ ufs_acl_setattr(struct inode *ip, struct vattr *vap, cred_t *cr) sp->aother->acl_ic_perm = (o_mode_t)(ip->i_mode & 07); } - if (mask & AT_UID) { + if (mask & VATTR_UID) { /* Caller has verified our privileges */ sp->aowner->acl_ic_who = ip->i_uid; } - if (mask & AT_GID) { + if (mask & VATTR_GID) { sp->agroup->acl_ic_who = ip->i_gid; } diff --git a/kernel/fs/ufs/ufs_dir.c b/kernel/fs/ufs/ufs_dir.c index cbb986e93a..e213d446c2 100644 --- a/kernel/fs/ufs/ufs_dir.c +++ b/kernel/fs/ufs/ufs_dir.c @@ -2077,7 +2077,7 @@ ufs_dirmakeinode( ASSERT(vap != NULL); ASSERT(op == DE_CREATE || op == DE_MKDIR || op == DE_ATTRDIR || op == DE_SYMLINK); - ASSERT((vap->va_mask & (AT_TYPE|AT_MODE)) == (AT_TYPE|AT_MODE)); + ASSERT((vap->va_mask & (VATTR_TYPE|VATTR_MODE)) == (VATTR_TYPE|VATTR_MODE)); ASSERT(RW_WRITE_HELD(&tdp->i_rwlock)); ASSERT(RW_WRITE_HELD(&tdp->i_contents)); /* @@ -2159,7 +2159,7 @@ ufs_dirmakeinode( * then use the process's gid. * 3) Otherwise, set the group-id to the gid of the parent directory. */ - if (op != DE_ATTRDIR && (vap->va_mask & AT_GID) && + if (op != DE_ATTRDIR && (vap->va_mask & VATTR_GID) && ((vap->va_gid == tdp->i_gid) || groupmember(vap->va_gid, cr) || secpolicy_vnode_create_gid(cr) == 0)) { /* @@ -2197,8 +2197,8 @@ ufs_dirmakeinode( ip->i_mode &= ~ISGID; } - if (((vap->va_mask & AT_ATIME) && TIMESPEC_OVERFLOW(&vap->va_atime)) || - ((vap->va_mask & AT_MTIME) && TIMESPEC_OVERFLOW(&vap->va_mtime))) { + if (((vap->va_mask & VATTR_ATIME) && TIMESPEC_OVERFLOW(&vap->va_atime)) || + ((vap->va_mask & VATTR_MTIME) && TIMESPEC_OVERFLOW(&vap->va_mtime))) { err = EOVERFLOW; goto fail; } @@ -2249,14 +2249,14 @@ ufs_dirmakeinode( * settings, then use them instead of using the current * high resolution time. */ - if (vap->va_mask & (AT_MTIME|AT_ATIME)) { - if (vap->va_mask & AT_ATIME) { + if (vap->va_mask & (VATTR_MTIME|VATTR_ATIME)) { + if (vap->va_mask & VATTR_ATIME) { ip->i_atime.tv_sec = vap->va_atime.tv_sec; ip->i_atime.tv_usec = vap->va_atime.tv_nsec / 1000; ip->i_flag &= ~IACC; } else ip->i_flag |= IACC; - if (vap->va_mask & AT_MTIME) { + if (vap->va_mask & VATTR_MTIME) { ip->i_mtime.tv_sec = vap->va_mtime.tv_sec; ip->i_mtime.tv_usec = vap->va_mtime.tv_nsec / 1000; gethrestime(&now); @@ -3208,7 +3208,7 @@ again: if (tdp->i_mode & 0004) va.va_mode |= 0705; } - va.va_mask = AT_TYPE|AT_MODE; + va.va_mask = VATTR_TYPE|VATTR_MODE; ufsvfsp = tdp->i_ufsvfs; diff --git a/kernel/fs/ufs/ufs_vnops.c b/kernel/fs/ufs/ufs_vnops.c index 7e4e9be737..4a5a2939e6 100644 --- a/kernel/fs/ufs/ufs_vnops.c +++ b/kernel/fs/ufs/ufs_vnops.c @@ -1996,7 +1996,7 @@ ufs_getattr(struct vnode *vp, struct vattr *vap, int flags, struct ufsvfs *ufsvfsp; int err; - if (vap->va_mask == AT_SIZE) { + if (vap->va_mask == VATTR_SIZE) { /* * for performance, if only the size is requested don't bother * with anything else. @@ -2125,7 +2125,7 @@ ufs_setattr(struct vnode *vp, struct vattr *vap, int flags, struct cred *cr, /* * Cannot set these attributes. */ - if ((mask & AT_NOSET) || (mask & AT_XVATTR)) + if ((mask & VATTR_NOSET) || (mask & VATTR_XVATTR)) return (EINVAL); /* @@ -2171,7 +2171,7 @@ again: /* * Truncate file. Must have write permission and not be a directory. */ - if (mask & AT_SIZE) { + if (mask & VATTR_SIZE) { rw_enter(&ip->i_contents, RW_WRITER); if (vp->v_type == VDIR) { error = EISDIR; @@ -2215,7 +2215,7 @@ again: /* * Grab quota lock if we are changing the file's owner. */ - if (mask & AT_UID) { + if (mask & VATTR_UID) { rw_enter(&ufsvfsp->vfs_dqrwlock, RW_READER); dodqlock = 1; } @@ -2225,7 +2225,7 @@ again: oldva.va_uid = ip->i_uid; oldva.va_gid = ip->i_gid; - vap->va_mask &= ~AT_SIZE; + vap->va_mask &= ~VATTR_SIZE; error = secpolicy_vnode_setattr(cr, vp, vap, &oldva, flags, ufs_priv_access, ip); @@ -2237,7 +2237,7 @@ again: /* * Change file access modes. */ - if (mask & AT_MODE) { + if (mask & VATTR_MODE) { ip->i_mode = (ip->i_mode & IFMT) | (vap->va_mode & ~IFMT); TRANS_INODE(ufsvfsp, ip); ip->i_flag |= ICHG; @@ -2250,8 +2250,8 @@ again: mutex_exit(&vp->v_lock); } } - if (mask & (AT_UID|AT_GID)) { - if (mask & AT_UID) { + if (mask & (VATTR_UID|VATTR_GID)) { + if (mask & VATTR_UID) { /* * Don't change ownership of the quota inode. */ @@ -2302,7 +2302,7 @@ again: /* force */ 1, cr, &errmsg2, &len2); } } - if (mask & AT_GID) { + if (mask & VATTR_GID) { ip->i_gid = vap->va_gid; } TRANS_INODE(ufsvfsp, ip); @@ -2311,10 +2311,10 @@ again: /* * Change file access or modified times. */ - if (mask & (AT_ATIME|AT_MTIME)) { + if (mask & (VATTR_ATIME|VATTR_MTIME)) { /* Check that the time value is within ufs range */ - if (((mask & AT_ATIME) && TIMESPEC_OVERFLOW(&vap->va_atime)) || - ((mask & AT_MTIME) && TIMESPEC_OVERFLOW(&vap->va_mtime))) { + if (((mask & VATTR_ATIME) && TIMESPEC_OVERFLOW(&vap->va_atime)) || + ((mask & VATTR_MTIME) && TIMESPEC_OVERFLOW(&vap->va_mtime))) { error = EOVERFLOW; goto update_inode; } @@ -2324,15 +2324,15 @@ again: * update is requested, do nothing. No error is returned. */ if ((ufsvfsp->vfs_noatime) && - ((mask & (AT_ATIME|AT_MTIME)) == AT_ATIME)) + ((mask & (VATTR_ATIME|VATTR_MTIME)) == VATTR_ATIME)) goto skip_atime; - if (mask & AT_ATIME) { + if (mask & VATTR_ATIME) { ip->i_atime.tv_sec = vap->va_atime.tv_sec; ip->i_atime.tv_usec = vap->va_atime.tv_nsec / 1000; ip->i_flag &= ~IACC; } - if (mask & AT_MTIME) { + if (mask & VATTR_MTIME) { ip->i_mtime.tv_sec = vap->va_mtime.tv_sec; ip->i_mtime.tv_usec = vap->va_mtime.tv_nsec / 1000; gethrestime(&now); @@ -3045,7 +3045,7 @@ again: ip->i_seq++; if (((ip->i_mode & IFMT) == IFREG) && - (vap->va_mask & AT_SIZE) && vap->va_size == 0) { + (vap->va_mask & VATTR_SIZE) && vap->va_size == 0) { /* * Truncate regular files, if requested by caller. * Grab i_rwlock to make sure no one else is @@ -3774,7 +3774,7 @@ ufs_mkdir(struct vnode *dvp, char *dirname, struct vattr *vap, int indeadlock; int retry = 1; - ASSERT((vap->va_mask & (AT_TYPE|AT_MODE)) == (AT_TYPE|AT_MODE)); + ASSERT((vap->va_mask & (VATTR_TYPE|VATTR_MODE)) == (VATTR_TYPE|VATTR_MODE)); /* * Can't make directory in attr hidden dir diff --git a/kernel/fs/vnode.c b/kernel/fs/vnode.c index 0b396d0b76..8bb53a1353 100644 --- a/kernel/fs/vnode.c +++ b/kernel/fs/vnode.c @@ -232,7 +232,7 @@ kmem_cache_t *vn_cache; /* * Zero out the structure, set the size of the requested/returned bitmaps, - * set AT_XVATTR in the embedded vattr_t's va_mask, and set up the pointer + * set VATTR_XVATTR in the embedded vattr_t's va_mask, and set up the pointer * to the returned attributes array. */ void @@ -241,19 +241,19 @@ xva_init(xvattr_t *xvap) bzero(xvap, sizeof (xvattr_t)); xvap->xva_mapsize = XVA_MAPSIZE; xvap->xva_magic = XVA_MAGIC; - xvap->xva_vattr.va_mask = AT_XVATTR; + xvap->xva_vattr.va_mask = VATTR_XVATTR; xvap->xva_rtnattrmapp = &(xvap->xva_rtnattrmap)[0]; } /* - * If AT_XVATTR is set, returns a pointer to the embedded xoptattr_t + * If VATTR_XVATTR is set, returns a pointer to the embedded xoptattr_t * structure. Otherwise, returns NULL. */ xoptattr_t * xva_getxoptattr(xvattr_t *xvap) { xoptattr_t *xoap = NULL; - if (xvap->xva_vattr.va_mask & AT_XVATTR) + if (xvap->xva_vattr.va_mask & VATTR_XVATTR) xoap = &xvap->xva_xoptattrs; return (xoap); } @@ -845,10 +845,10 @@ top: /* Wish to create a file. */ vattr.va_type = VREG; vattr.va_mode = createmode; - vattr.va_mask = AT_TYPE|AT_MODE; + vattr.va_mask = VATTR_TYPE|VATTR_MODE; if (filemode & FTRUNC) { vattr.va_size = 0; - vattr.va_mask |= AT_SIZE; + vattr.va_mask |= VATTR_SIZE; } if (filemode & FEXCL) excl = EXCL; @@ -876,7 +876,7 @@ top: */ if (!(filemode & FOFFMAX) && (vp->v_type == VREG)) { - vattr.va_mask = AT_SIZE; + vattr.va_mask = VATTR_SIZE; if ((error = fop_getattr(vp, &vattr, 0, CRED(), NULL))) { goto out; @@ -917,7 +917,7 @@ top: if (fop_realvp(vp, &rvp, NULL) != 0) rvp = vp; if (rvp->v_filocks != NULL) { - vattr.va_mask = AT_MODE; + vattr.va_mask = VATTR_MODE; if ((error = fop_getattr(vp, &vattr, 0, CRED(), NULL)) == 0 && MANDLOCK(vp, vattr.va_mode)) @@ -954,7 +954,7 @@ top: goto out; } if (filemode & FNOLINKS) { - vattr.va_mask = AT_NLINK; + vattr.va_mask = VATTR_NLINK; if ((error = fop_getattr(vp, &vattr, 0, CRED(), NULL))) { goto out; } @@ -1012,7 +1012,7 @@ top: nbl_start_crit(vp, RW_READER); in_crit = 1; - vattr.va_mask = AT_SIZE; + vattr.va_mask = VATTR_SIZE; if (error = fop_getattr(vp, &vattr, 0, CRED(), NULL)) goto out; if (nbl_conflict(vp, NBL_WRITE, 0, vattr.va_size, 0, @@ -1036,7 +1036,7 @@ top: */ if ((filemode & FTRUNC) && !(filemode & FCREAT)) { vattr.va_size = 0; - vattr.va_mask = AT_SIZE; + vattr.va_mask = VATTR_SIZE; if ((error = fop_setattr(vp, &vattr, 0, CRED(), NULL)) != 0) goto out; } @@ -1165,7 +1165,7 @@ vn_createat( int estale_retry = 0; uint32_t auditing = AU_AUDITING(); - ASSERT((vap->va_mask & (AT_TYPE|AT_MODE)) == (AT_TYPE|AT_MODE)); + ASSERT((vap->va_mask & (VATTR_TYPE|VATTR_MODE)) == (VATTR_TYPE|VATTR_MODE)); /* symlink interpretation */ if ((flag & FNOFOLLOW) || excl == EXCL) @@ -1286,12 +1286,12 @@ top: vp = *vpp; if (fop_realvp(vp, &rvp, NULL) != 0) rvp = vp; - if ((vap->va_mask & AT_SIZE) && nbl_need_check(vp)) { + if ((vap->va_mask & VATTR_SIZE) && nbl_need_check(vp)) { nbl_start_crit(vp, RW_READER); in_crit = 1; } if (rvp->v_filocks != NULL || rvp->v_shrlocks != NULL) { - vattr.va_mask = AT_MODE|AT_SIZE; + vattr.va_mask = VATTR_MODE|VATTR_SIZE; if (error = fop_getattr(vp, &vattr, 0, CRED(), NULL)) { goto out; } @@ -1303,7 +1303,7 @@ top: * File cannot be truncated if non-blocking mandatory * locks are currently on the file. */ - if ((vap->va_mask & AT_SIZE) && in_crit) { + if ((vap->va_mask & VATTR_SIZE) && in_crit) { uoff_t offset; ssize_t length; @@ -1355,7 +1355,7 @@ top: if (why != CRMKDIR && !(flag & FOFFMAX) && (vp->v_type == VREG)) { - vattr.va_mask = AT_SIZE; + vattr.va_mask = VATTR_SIZE; if ((error = fop_getattr(vp, &vattr, 0, CRED(), NULL))) { goto out; @@ -1455,11 +1455,11 @@ top: * Make sure both source vnode and target directory vnode are * in the same vfs and that it is writeable. */ - vattr.va_mask = AT_FSID; + vattr.va_mask = VATTR_FSID; if (error = fop_getattr(fvp, &vattr, 0, CRED(), NULL)) goto out; fsid = vattr.va_fsid; - vattr.va_mask = AT_FSID; + vattr.va_mask = VATTR_FSID; if (error = fop_getattr(tdvp, &vattr, 0, CRED(), NULL)) goto out; if (fsid != vattr.va_fsid) { @@ -1558,11 +1558,11 @@ top: * We check fsid's, not vfs pointers, so loopback fs works. */ if (fromvp != tovp) { - vattr.va_mask = AT_FSID; + vattr.va_mask = VATTR_FSID; if (error = fop_getattr(fromvp, &vattr, 0, CRED(), NULL)) goto out; fsid = vattr.va_fsid; - vattr.va_mask = AT_FSID; + vattr.va_mask = VATTR_FSID; if (error = fop_getattr(tovp, &vattr, 0, CRED(), NULL)) goto out; if (fsid != vattr.va_fsid) { @@ -3255,7 +3255,7 @@ fop_getattr( * then turn off the xvattr bit. */ if (vfs_has_feature(vp->v_vfsp, VFSFT_XVATTR) == 0) { - vap->va_mask &= ~AT_XVATTR; + vap->va_mask &= ~VATTR_XVATTR; } /* @@ -3289,7 +3289,7 @@ fop_setattr( * then turn off the xvattr bit. */ if (vfs_has_feature(vp->v_vfsp, VFSFT_XVATTR) == 0) { - vap->va_mask &= ~AT_XVATTR; + vap->va_mask &= ~VATTR_XVATTR; } /* @@ -4482,7 +4482,7 @@ fs_reparse_mark(char *target, vattr_t *vap, xvattr_t *xvattr) xva_init(xvattr); xvattr->xva_vattr = *vap; - xvattr->xva_vattr.va_mask |= AT_XVATTR; + xvattr->xva_vattr.va_mask |= VATTR_XVATTR; xoap = xva_getxoptattr(xvattr); ASSERT(xoap); XVA_SET_REQ(xvattr, XAT_REPARSE); @@ -4513,7 +4513,7 @@ vn_is_reparse(vnode_t *vp, cred_t *cr, caller_context_t *ct) if (fop_getattr(vp, &xvattr.xva_vattr, 0, cr, ct)) return (B_FALSE); - if ((!(xvattr.xva_vattr.va_mask & AT_XVATTR)) || + if ((!(xvattr.xva_vattr.va_mask & VATTR_XVATTR)) || (!(XVA_ISSET_RTN(&xvattr, XAT_REPARSE)))) return (B_FALSE); diff --git a/kernel/fs/xattr.c b/kernel/fs/xattr.c index 6521c4fcd5..35567e6361 100644 --- a/kernel/fs/xattr.c +++ b/kernel/fs/xattr.c @@ -228,7 +228,7 @@ xattr_fill_nvlist(vnode_t *vp, xattr_view_t xattr_view, nvlist_t *nvlp, /* * For detecting ephemeral uid/gid */ - xvattr.xva_vattr.va_mask |= (AT_UID|AT_GID); + xvattr.xva_vattr.va_mask |= (VATTR_UID|VATTR_GID); /* * We need to access the real fs object. @@ -318,7 +318,7 @@ xattr_fill_nvlist(vnode_t *vp, xattr_view_t xattr_view, nvlist_t *nvlp, * Process all the optional attributes together here. Notice that * xoap was set when the optional attribute bits were set above. */ - if ((xvattr.xva_vattr.va_mask & AT_XVATTR) && xoap) { + if ((xvattr.xva_vattr.va_mask & VATTR_XVATTR) && xoap) { if (XVA_ISSET_RTN(&xvattr, XAT_READONLY)) { VERIFY(nvlist_add_boolean_value(nvlp, attr_to_name(F_READONLY), @@ -493,7 +493,7 @@ xattr_file_getattr(vnode_t *vp, vattr_t *vap, int flags, cred_t *cr, vap->va_nlink = 1; pvp = gfs_file_parent(vp); (void) memset(&pvattr, 0, sizeof (pvattr)); - pvattr.va_mask = AT_CTIME|AT_MTIME; + pvattr.va_mask = VATTR_CTIME|VATTR_MTIME; error = fop_getattr(pvp, &pvattr, flags, cr, ct); if (error) { return (error); @@ -763,11 +763,11 @@ xattr_file_write(vnode_t *vp, uio_t *uiop, int ioflag, cred_t *cr, if (attr == F_OWNERSID) { (void) kidmap_getuidbysid(crgetzone(cr), domain, rid, &xvattr.xva_vattr.va_uid); - xvattr.xva_vattr.va_mask |= AT_UID; + xvattr.xva_vattr.va_mask |= VATTR_UID; } else { (void) kidmap_getgidbysid(crgetzone(cr), domain, rid, &xvattr.xva_vattr.va_gid); - xvattr.xva_vattr.va_mask |= AT_GID; + xvattr.xva_vattr.va_mask |= VATTR_GID; } break; case F_AV_SCANSTAMP: @@ -1068,7 +1068,7 @@ xattr_dir_close(vnode_t *vp, int flags, int count, offset_t off, cred_t *cr, * that fop_getattr() could turn off bits in the va_mask. */ -#define PARENT_ATTRMASK (AT_UID|AT_GID|AT_RDEV|AT_CTIME|AT_MTIME) +#define PARENT_ATTRMASK (VATTR_UID|VATTR_GID|VATTR_RDEV|VATTR_CTIME|VATTR_MTIME) /* ARGSUSED */ static int diff --git a/kernel/fs/zfs/sys/zfs_znode.h b/kernel/fs/zfs/sys/zfs_znode.h index bebe577d3f..154a218f40 100644 --- a/kernel/fs/zfs/sys/zfs_znode.h +++ b/kernel/fs/zfs/sys/zfs_znode.h @@ -274,9 +274,9 @@ typedef struct znode { /* * Timestamp defines */ -#define ACCESSED (AT_ATIME) -#define STATE_CHANGED (AT_CTIME) -#define CONTENT_MODIFIED (AT_MTIME | AT_CTIME) +#define ACCESSED (VATTR_ATIME) +#define STATE_CHANGED (VATTR_CTIME) +#define CONTENT_MODIFIED (VATTR_MTIME | VATTR_CTIME) #define ZFS_ACCESSTIME_STAMP(zfsvfs, zp) \ if ((zfsvfs)->z_atime && !((zfsvfs)->z_vfs->vfs_flag & VFS_RDONLY)) \ diff --git a/kernel/fs/zfs/vdev_file.c b/kernel/fs/zfs/vdev_file.c index 74906cfc76..25f79b43b7 100644 --- a/kernel/fs/zfs/vdev_file.c +++ b/kernel/fs/zfs/vdev_file.c @@ -109,7 +109,7 @@ skip_open: /* * Determine the physical size of the file. */ - vattr.va_mask = AT_SIZE; + vattr.va_mask = VATTR_SIZE; error = fop_getattr(vf->vf_vnode, &vattr, 0, kcred, NULL); if (error) { vd->vdev_stat.vs_aux = VDEV_AUX_OPEN_FAILED; diff --git a/kernel/fs/zfs/zfs_acl.c b/kernel/fs/zfs/zfs_acl.c index 6b40fa76ef..3c389f654e 100644 --- a/kernel/fs/zfs/zfs_acl.c +++ b/kernel/fs/zfs/zfs_acl.c @@ -1658,7 +1658,7 @@ zfs_acl_ids_create(znode_t *dzp, int flag, vattr_t *vap, cred_t *cr, acl_ids->z_fuid = zfs_fuid_create_cred(zfsvfs, ZFS_OWNER, cr, &acl_ids->z_fuidp); acl_ids->z_fgid = 0; - if (vap->va_mask & AT_GID) { + if (vap->va_mask & VATTR_GID) { acl_ids->z_fgid = zfs_fuid_create(zfsvfs, (uint64_t)vap->va_gid, cr, ZFS_GROUP, &acl_ids->z_fuidp); diff --git a/kernel/fs/zfs/zfs_dir.c b/kernel/fs/zfs/zfs_dir.c index 4baf55591c..8edecab1fb 100644 --- a/kernel/fs/zfs/zfs_dir.c +++ b/kernel/fs/zfs/zfs_dir.c @@ -1077,7 +1077,7 @@ top: * Once in a directory the ability to read/write attributes * is controlled by the permissions on the attribute file. */ - va.va_mask = AT_TYPE | AT_MODE | AT_UID | AT_GID; + va.va_mask = VATTR_TYPE | VATTR_MODE | VATTR_UID | VATTR_GID; va.va_type = VDIR; va.va_mode = S_IFDIR | S_ISVTX | 0777; zfs_fuid_map_ids(zp, cr, &va.va_uid, &va.va_gid); diff --git a/kernel/fs/zfs/zfs_ioctl.c b/kernel/fs/zfs/zfs_ioctl.c index 22a73b3f30..d460d78dd9 100644 --- a/kernel/fs/zfs/zfs_ioctl.c +++ b/kernel/fs/zfs/zfs_ioctl.c @@ -5249,7 +5249,7 @@ zfs_ioc_smb_acl(zfs_cmd_t *zc) switch (zc->zc_cookie) { case ZFS_SMB_ACL_ADD: - vattr.va_mask = AT_MODE|AT_UID|AT_GID|AT_TYPE; + vattr.va_mask = VATTR_MODE|VATTR_UID|VATTR_GID|VATTR_TYPE; vattr.va_type = VREG; vattr.va_mode = S_IFREG|0777; vattr.va_uid = 0; diff --git a/kernel/fs/zfs/zfs_log.c b/kernel/fs/zfs/zfs_log.c index fbac2d99c2..e3e6aedaa6 100644 --- a/kernel/fs/zfs/zfs_log.c +++ b/kernel/fs/zfs/zfs_log.c @@ -70,7 +70,7 @@ int zfs_log_create_txtype(zil_create_t type, vsecattr_t *vsecp, vattr_t *vap) { - int isxvattr = (vap->va_mask & AT_XVATTR); + int isxvattr = (vap->va_mask & VATTR_XVATTR); switch (type) { case Z_FILE: if (vsecp == NULL && !isxvattr) @@ -260,7 +260,7 @@ zfs_log_create(zilog_t *zilog, dmu_tx_t *tx, uint64_t txtype, fuidsz += fuidp->z_fuid_cnt * sizeof (uint64_t); } - if (vap->va_mask & AT_XVATTR) + if (vap->va_mask & VATTR_XVATTR) xvatsize = ZIL_XVAT_SIZE(xvap->xva_mapsize); if ((int)txtype == TX_CREATE_ATTR || (int)txtype == TX_MKDIR_ATTR || @@ -303,7 +303,7 @@ zfs_log_create(zilog_t *zilog, dmu_tx_t *tx, uint64_t txtype, /* * Fill in xvattr info if any */ - if (vap->va_mask & AT_XVATTR) { + if (vap->va_mask & VATTR_XVATTR) { zfs_log_xvattr((lr_attr_t *)((caddr_t)lr + lrsize), xvap); end = (caddr_t)lr + lrsize + xvatsize; } else { @@ -561,7 +561,7 @@ zfs_log_setattr(zilog_t *zilog, dmu_tx_t *tx, int txtype, * for lr_attr_t + xvattr mask, mapsize and create time * plus actual attribute values */ - if (vap->va_mask & AT_XVATTR) + if (vap->va_mask & VATTR_XVATTR) recsize = sizeof (*lr) + ZIL_XVAT_SIZE(xvap->xva_mapsize); if (fuidp) @@ -572,12 +572,12 @@ zfs_log_setattr(zilog_t *zilog, dmu_tx_t *tx, int txtype, lr->lr_foid = zp->z_id; lr->lr_mask = (uint64_t)mask_applied; lr->lr_mode = (uint64_t)vap->va_mode; - if ((mask_applied & AT_UID) && IS_EPHEMERAL(vap->va_uid)) + if ((mask_applied & VATTR_UID) && IS_EPHEMERAL(vap->va_uid)) lr->lr_uid = fuidp->z_fuid_owner; else lr->lr_uid = (uint64_t)vap->va_uid; - if ((mask_applied & AT_GID) && IS_EPHEMERAL(vap->va_gid)) + if ((mask_applied & VATTR_GID) && IS_EPHEMERAL(vap->va_gid)) lr->lr_gid = fuidp->z_fuid_group; else lr->lr_gid = (uint64_t)vap->va_gid; @@ -586,7 +586,7 @@ zfs_log_setattr(zilog_t *zilog, dmu_tx_t *tx, int txtype, ZFS_TIME_ENCODE(&vap->va_atime, lr->lr_atime); ZFS_TIME_ENCODE(&vap->va_mtime, lr->lr_mtime); start = (lr_setattr_t *)(lr + 1); - if (vap->va_mask & AT_XVATTR) { + if (vap->va_mask & VATTR_XVATTR) { zfs_log_xvattr((lr_attr_t *)start, xvap); start = (caddr_t)start + ZIL_XVAT_SIZE(xvap->xva_mapsize); } diff --git a/kernel/fs/zfs/zfs_replay.c b/kernel/fs/zfs/zfs_replay.c index 2c4882c68f..43cd330779 100644 --- a/kernel/fs/zfs/zfs_replay.c +++ b/kernel/fs/zfs/zfs_replay.c @@ -84,9 +84,9 @@ zfs_replay_xvattr(lr_attr_t *lrattr, xvattr_t *xvap) void *scanstamp; int i; - xvap->xva_vattr.va_mask |= AT_XVATTR; + xvap->xva_vattr.va_mask |= VATTR_XVATTR; if ((xoap = xva_getxoptattr(xvap)) == NULL) { - xvap->xva_vattr.va_mask &= ~AT_XVATTR; /* shouldn't happen */ + xvap->xva_vattr.va_mask &= ~VATTR_XVATTR; /* shouldn't happen */ return; } @@ -304,7 +304,7 @@ zfs_replay_create_acl(void *arg1, void *arg2, boolean_t byteswap) return (error); xva_init(&xva); - zfs_init_vattr(&xva.xva_vattr, AT_TYPE | AT_MODE | AT_UID | AT_GID, + zfs_init_vattr(&xva.xva_vattr, VATTR_TYPE | VATTR_MODE | VATTR_UID | VATTR_GID, lr->lr_mode, lr->lr_uid, lr->lr_gid, lr->lr_rdev, lr->lr_foid); /* @@ -336,7 +336,7 @@ zfs_replay_create_acl(void *arg1, void *arg2, boolean_t byteswap) if (name == NULL) { lrattr = (lr_attr_t *)(caddr_t)(lracl + 1); xvatlen = ZIL_XVAT_SIZE(lrattr->lr_attr_masksize); - xva.xva_vattr.va_mask |= AT_XVATTR; + xva.xva_vattr.va_mask |= VATTR_XVATTR; zfs_replay_xvattr(lrattr, &xva); } vsec.vsa_mask = VSA_ACE | VSA_ACE_ACLFLAGS; @@ -433,7 +433,7 @@ zfs_replay_create(void *arg1, void *arg2, boolean_t byteswap) return (error); xva_init(&xva); - zfs_init_vattr(&xva.xva_vattr, AT_TYPE | AT_MODE | AT_UID | AT_GID, + zfs_init_vattr(&xva.xva_vattr, VATTR_TYPE | VATTR_MODE | VATTR_UID | VATTR_GID, lr->lr_mode, lr->lr_uid, lr->lr_gid, lr->lr_rdev, lr->lr_foid); /* @@ -790,7 +790,7 @@ zfs_replay_setattr(void *arg1, void *arg2, boolean_t byteswap) if (byteswap) { byteswap_uint64_array(lr, sizeof (*lr)); - if ((lr->lr_mask & AT_XVATTR) && + if ((lr->lr_mask & VATTR_XVATTR) && zfsvfs->z_version >= ZPL_VERSION_INITIAL) zfs_replay_swap_attrs((lr_attr_t *)(lr + 1)); } @@ -810,12 +810,12 @@ zfs_replay_setattr(void *arg1, void *arg2, boolean_t byteswap) */ start = (lr_setattr_t *)(lr + 1); - if (vap->va_mask & AT_XVATTR) { + if (vap->va_mask & VATTR_XVATTR) { zfs_replay_xvattr((lr_attr_t *)start, &xva); start = (caddr_t)start + ZIL_XVAT_SIZE(((lr_attr_t *)start)->lr_attr_masksize); } else - xva.xva_vattr.va_mask &= ~AT_XVATTR; + xva.xva_vattr.va_mask &= ~VATTR_XVATTR; zfsvfs->z_fuid_replay = zfs_replay_fuid_domain(start, &start, lr->lr_uid, lr->lr_gid); diff --git a/kernel/fs/zfs/zfs_vfsops.c b/kernel/fs/zfs/zfs_vfsops.c index 30e09b0675..f91d6bde3b 100644 --- a/kernel/fs/zfs/zfs_vfsops.c +++ b/kernel/fs/zfs/zfs_vfsops.c @@ -1465,7 +1465,7 @@ zfs_mount(vfs_t *vfsp, vnode_t *mvp, struct mounta *uap, cred_t *cr) * or has sufficient privileges. */ - vattr.va_mask = AT_UID; + vattr.va_mask = VATTR_UID; if (fop_getattr(mvp, &vattr, 0, cr, NULL)) { goto out; diff --git a/kernel/fs/zfs/zfs_vnops.c b/kernel/fs/zfs/zfs_vnops.c index 58729dec89..63807d27f2 100644 --- a/kernel/fs/zfs/zfs_vnops.c +++ b/kernel/fs/zfs/zfs_vnops.c @@ -1424,7 +1424,7 @@ zfs_create(vnode_t *dvp, char *name, vattr_t *vap, vcexcl_t excl, uid = crgetuid(cr); if (zfsvfs->z_use_fuids == B_FALSE && - (vsecp || (vap->va_mask & AT_XVATTR) || + (vsecp || (vap->va_mask & VATTR_XVATTR) || IS_EPHEMERAL(uid) || IS_EPHEMERAL(gid))) return (SET_ERROR(EINVAL)); @@ -1439,7 +1439,7 @@ zfs_create(vnode_t *dvp, char *name, vattr_t *vap, vcexcl_t excl, return (SET_ERROR(EILSEQ)); } - if (vap->va_mask & AT_XVATTR) { + if (vap->va_mask & VATTR_XVATTR) { if ((error = secpolicy_xvattr((xvattr_t *)vap, crgetuid(cr), cr, vap->va_type)) != 0) { ZFS_EXIT(zfsvfs); @@ -1598,7 +1598,7 @@ top: * Truncate regular files if requested. */ if ((ZTOV(zp)->v_type == VREG) && - (vap->va_mask & AT_SIZE) && (vap->va_size == 0)) { + (vap->va_mask & VATTR_SIZE) && (vap->va_size == 0)) { /* we can't hold any locks when calling zfs_freesp() */ zfs_dirent_unlock(dl); dl = NULL; @@ -1917,7 +1917,7 @@ zfs_mkdir(vnode_t *dvp, char *dirname, vattr_t *vap, vnode_t **vpp, cred_t *cr, else uid = crgetuid(cr); if (zfsvfs->z_use_fuids == B_FALSE && - (vsecp || (vap->va_mask & AT_XVATTR) || + (vsecp || (vap->va_mask & VATTR_XVATTR) || IS_EPHEMERAL(uid) || IS_EPHEMERAL(gid))) return (SET_ERROR(EINVAL)); @@ -1938,7 +1938,7 @@ zfs_mkdir(vnode_t *dvp, char *dirname, vattr_t *vap, vnode_t **vpp, cred_t *cr, if (flags & FIGNORECASE) zf |= ZCILOOK; - if (vap->va_mask & AT_XVATTR) { + if (vap->va_mask & VATTR_XVATTR) { if ((error = secpolicy_xvattr((xvattr_t *)vap, crgetuid(cr), cr, vap->va_type)) != 0) { ZFS_EXIT(zfsvfs); @@ -2506,7 +2506,7 @@ zfs_fsync(vnode_t *vp, int syncflag, cred_t *cr, caller_context_t *ct) * * IN: vp - vnode of file. * vap - va_mask identifies requested attributes. - * If AT_XVATTR set, then optional attrs are requested + * If VATTR_XVATTR set, then optional attrs are requested * flags - ATTR_NOACLCHECK (CIFS server context) * cr - credentials of caller. * ct - caller context @@ -2709,7 +2709,7 @@ zfs_getattr(vnode_t *vp, vattr_t *vap, int flags, cred_t *cr, * * IN: vp - vnode of file to be modified. * vap - new attribute values. - * If AT_XVATTR set, then optional attrs are being set + * If VATTR_XVATTR set, then optional attrs are being set * flags - ATTR_UTIME set if non-default time values provided. * - ATTR_NOACLCHECK (CIFS context only). * cr - credentials of caller. @@ -2753,7 +2753,7 @@ zfs_setattr(vnode_t *vp, vattr_t *vap, int flags, cred_t *cr, if (mask == 0) return (0); - if (mask & AT_NOSET) + if (mask & VATTR_NOSET) return (SET_ERROR(EINVAL)); ZFS_ENTER(zfsvfs); @@ -2767,19 +2767,19 @@ zfs_setattr(vnode_t *vp, vattr_t *vap, int flags, cred_t *cr, */ if (zfsvfs->z_use_fuids == B_FALSE && - (((mask & AT_UID) && IS_EPHEMERAL(vap->va_uid)) || - ((mask & AT_GID) && IS_EPHEMERAL(vap->va_gid)) || - (mask & AT_XVATTR))) { + (((mask & VATTR_UID) && IS_EPHEMERAL(vap->va_uid)) || + ((mask & VATTR_GID) && IS_EPHEMERAL(vap->va_gid)) || + (mask & VATTR_XVATTR))) { ZFS_EXIT(zfsvfs); return (SET_ERROR(EINVAL)); } - if (mask & AT_SIZE && vp->v_type == VDIR) { + if (mask & VATTR_SIZE && vp->v_type == VDIR) { ZFS_EXIT(zfsvfs); return (SET_ERROR(EISDIR)); } - if (mask & AT_SIZE && vp->v_type != VREG && vp->v_type != VFIFO) { + if (mask & VATTR_SIZE && vp->v_type != VREG && vp->v_type != VFIFO) { ZFS_EXIT(zfsvfs); return (SET_ERROR(EINVAL)); } @@ -2796,8 +2796,8 @@ zfs_setattr(vnode_t *vp, vattr_t *vap, int flags, cred_t *cr, * Immutable files can only alter immutable bit and atime */ if ((zp->z_pflags & ZFS_IMMUTABLE) && - ((mask & (AT_SIZE|AT_UID|AT_GID|AT_MTIME|AT_MODE)) || - ((mask & AT_XVATTR) && XVA_ISSET_REQ(xvap, XAT_CREATETIME)))) { + ((mask & (VATTR_SIZE|VATTR_UID|VATTR_GID|VATTR_MTIME|VATTR_MODE)) || + ((mask & VATTR_XVATTR) && XVA_ISSET_REQ(xvap, XAT_CREATETIME)))) { ZFS_EXIT(zfsvfs); return (SET_ERROR(EPERM)); } @@ -2812,9 +2812,9 @@ zfs_setattr(vnode_t *vp, vattr_t *vap, int flags, cred_t *cr, * handle times greater than 2039. This check should be removed * once large timestamps are fully supported. */ - if (mask & (AT_ATIME | AT_MTIME)) { - if (((mask & AT_ATIME) && TIMESPEC_OVERFLOW(&vap->va_atime)) || - ((mask & AT_MTIME) && TIMESPEC_OVERFLOW(&vap->va_mtime))) { + if (mask & (VATTR_ATIME | VATTR_MTIME)) { + if (((mask & VATTR_ATIME) && TIMESPEC_OVERFLOW(&vap->va_atime)) || + ((mask & VATTR_MTIME) && TIMESPEC_OVERFLOW(&vap->va_mtime))) { ZFS_EXIT(zfsvfs); return (SET_ERROR(EOVERFLOW)); } @@ -2834,7 +2834,7 @@ top: * First validate permissions */ - if (mask & AT_SIZE) { + if (mask & VATTR_SIZE) { err = zfs_zaccess(zp, ACE_WRITE_DATA, 0, skipaclchk, cr); if (err) { ZFS_EXIT(zfsvfs); @@ -2857,8 +2857,8 @@ top: vnevent_truncate(ZTOV(zp), ct); } - if (mask & (AT_ATIME|AT_MTIME) || - ((mask & AT_XVATTR) && (XVA_ISSET_REQ(xvap, XAT_HIDDEN) || + if (mask & (VATTR_ATIME|VATTR_MTIME) || + ((mask & VATTR_XVATTR) && (XVA_ISSET_REQ(xvap, XAT_HIDDEN) || XVA_ISSET_REQ(xvap, XAT_READONLY) || XVA_ISSET_REQ(xvap, XAT_ARCHIVE) || XVA_ISSET_REQ(xvap, XAT_OFFLINE) || @@ -2869,8 +2869,8 @@ top: skipaclchk, cr); } - if (mask & (AT_UID|AT_GID)) { - int idmask = (mask & (AT_UID|AT_GID)); + if (mask & (VATTR_UID|VATTR_GID)) { + int idmask = (mask & (VATTR_UID|VATTR_GID)); int take_owner; int take_group; @@ -2879,19 +2879,19 @@ top: * we may clear S_ISUID/S_ISGID bits. */ - if (!(mask & AT_MODE)) + if (!(mask & VATTR_MODE)) vap->va_mode = zp->z_mode; /* * Take ownership or chgrp to group we are a member of */ - take_owner = (mask & AT_UID) && (vap->va_uid == crgetuid(cr)); - take_group = (mask & AT_GID) && + take_owner = (mask & VATTR_UID) && (vap->va_uid == crgetuid(cr)); + take_group = (mask & VATTR_GID) && zfs_groupmember(zfsvfs, vap->va_gid, cr); /* - * If both AT_UID and AT_GID are set then take_owner and + * If both VATTR_UID and VATTR_GID are set then take_owner and * take_group must both be set in order to allow taking * ownership. * @@ -2899,16 +2899,16 @@ top: * */ - if (((idmask == (AT_UID|AT_GID)) && take_owner && take_group) || - ((idmask == AT_UID) && take_owner) || - ((idmask == AT_GID) && take_group)) { + if (((idmask == (VATTR_UID|VATTR_GID)) && take_owner && take_group) || + ((idmask == VATTR_UID) && take_owner) || + ((idmask == VATTR_GID) && take_group)) { if (zfs_zaccess(zp, ACE_WRITE_OWNER, 0, skipaclchk, cr) == 0) { /* * Remove setuid/setgid for non-privileged users */ secpolicy_setid_clear(vap, cr); - trim_mask = (mask & (AT_UID|AT_GID)); + trim_mask = (mask & (VATTR_UID|VATTR_GID)); } else { need_policy = TRUE; } @@ -2920,7 +2920,7 @@ top: mutex_enter(&zp->z_lock); oldva.va_mode = zp->z_mode; zfs_fuid_map_ids(zp, cr, &oldva.va_uid, &oldva.va_gid); - if (mask & AT_XVATTR) { + if (mask & VATTR_XVATTR) { /* * Update xvattr mask to include only those attributes * that are actually changing. @@ -3005,7 +3005,7 @@ top: mutex_exit(&zp->z_lock); - if (mask & AT_MODE) { + if (mask & VATTR_MODE) { if (zfs_zaccess(zp, ACE_WRITE_ACL, 0, skipaclchk, cr) == 0) { err = secpolicy_setid_setsticky_clear(vp, vap, &oldva, cr); @@ -3013,7 +3013,7 @@ top: ZFS_EXIT(zfsvfs); return (err); } - trim_mask |= AT_MODE; + trim_mask |= VATTR_MODE; } else { need_policy = TRUE; } @@ -3049,7 +3049,7 @@ top: */ mask = vap->va_mask; - if ((mask & (AT_UID | AT_GID))) { + if ((mask & (VATTR_UID | VATTR_GID))) { err = sa_lookup(zp->z_sa_hdl, SA_ZPL_XATTR(zfsvfs), &xattr_obj, sizeof (xattr_obj)); @@ -3058,7 +3058,7 @@ top: if (err) goto out2; } - if (mask & AT_UID) { + if (mask & VATTR_UID) { new_uid = zfs_fuid_create(zfsvfs, (uint64_t)vap->va_uid, cr, ZFS_OWNER, &fuidp); if (new_uid != zp->z_uid && @@ -3070,7 +3070,7 @@ top: } } - if (mask & AT_GID) { + if (mask & VATTR_GID) { new_gid = zfs_fuid_create(zfsvfs, (uint64_t)vap->va_gid, cr, ZFS_GROUP, &fuidp); if (new_gid != zp->z_gid && @@ -3084,7 +3084,7 @@ top: } tx = dmu_tx_create(zfsvfs->z_os); - if (mask & AT_MODE) { + if (mask & VATTR_MODE) { uint64_t pmode = zp->z_mode; uint64_t acl_obj; new_mode = (pmode & S_IFMT) | (vap->va_mode & ~S_IFMT); @@ -3122,7 +3122,7 @@ top: mutex_exit(&zp->z_lock); dmu_tx_hold_sa(tx, zp->z_sa_hdl, B_TRUE); } else { - if ((mask & AT_XVATTR) && + if ((mask & VATTR_XVATTR) && XVA_ISSET_REQ(xvap, XAT_AV_SCANSTAMP)) dmu_tx_hold_sa(tx, zp->z_sa_hdl, B_TRUE); else @@ -3153,7 +3153,7 @@ top: */ - if (mask & (AT_UID|AT_GID|AT_MODE)) + if (mask & (VATTR_UID|VATTR_GID|VATTR_MODE)) mutex_enter(&zp->z_acl_lock); mutex_enter(&zp->z_lock); @@ -3161,7 +3161,7 @@ top: &zp->z_pflags, sizeof (zp->z_pflags)); if (attrzp) { - if (mask & (AT_UID|AT_GID|AT_MODE)) + if (mask & (VATTR_UID|VATTR_GID|VATTR_MODE)) mutex_enter(&attrzp->z_acl_lock); mutex_enter(&attrzp->z_lock); SA_ADD_BULK_ATTR(xattr_bulk, xattr_count, @@ -3169,9 +3169,9 @@ top: sizeof (attrzp->z_pflags)); } - if (mask & (AT_UID|AT_GID)) { + if (mask & (VATTR_UID|VATTR_GID)) { - if (mask & AT_UID) { + if (mask & VATTR_UID) { SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_UID(zfsvfs), NULL, &new_uid, sizeof (new_uid)); zp->z_uid = new_uid; @@ -3183,7 +3183,7 @@ top: } } - if (mask & AT_GID) { + if (mask & VATTR_GID) { SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_GID(zfsvfs), NULL, &new_gid, sizeof (new_gid)); zp->z_gid = new_gid; @@ -3194,7 +3194,7 @@ top: attrzp->z_gid = new_gid; } } - if (!(mask & AT_MODE)) { + if (!(mask & VATTR_MODE)) { SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_MODE(zfsvfs), NULL, &new_mode, sizeof (new_mode)); new_mode = zp->z_mode; @@ -3207,7 +3207,7 @@ top: } } - if (mask & AT_MODE) { + if (mask & VATTR_MODE) { SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_MODE(zfsvfs), NULL, &new_mode, sizeof (new_mode)); zp->z_mode = new_mode; @@ -3221,20 +3221,20 @@ top: } - if (mask & AT_ATIME) { + if (mask & VATTR_ATIME) { ZFS_TIME_ENCODE(&vap->va_atime, zp->z_atime); SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_ATIME(zfsvfs), NULL, &zp->z_atime, sizeof (zp->z_atime)); } - if (mask & AT_MTIME) { + if (mask & VATTR_MTIME) { ZFS_TIME_ENCODE(&vap->va_mtime, mtime); SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_MTIME(zfsvfs), NULL, mtime, sizeof (mtime)); } /* XXX - shouldn't this be done *before* the ATIME/MTIME checks? */ - if (mask & AT_SIZE && !(mask & AT_MTIME)) { + if (mask & VATTR_SIZE && !(mask & VATTR_MTIME)) { SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_MTIME(zfsvfs), NULL, mtime, sizeof (mtime)); SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_CTIME(zfsvfs), NULL, @@ -3259,7 +3259,7 @@ top: * update from toggling bit */ - if (xoap && (mask & AT_XVATTR)) { + if (xoap && (mask & VATTR_XVATTR)) { /* * restore trimmed off masks @@ -3298,11 +3298,11 @@ top: zfs_log_setattr(zilog, tx, TX_SETATTR, zp, vap, mask, fuidp); mutex_exit(&zp->z_lock); - if (mask & (AT_UID|AT_GID|AT_MODE)) + if (mask & (VATTR_UID|VATTR_GID|VATTR_MODE)) mutex_exit(&zp->z_acl_lock); if (attrzp) { - if (mask & (AT_UID|AT_GID|AT_MODE)) + if (mask & (VATTR_UID|VATTR_GID|VATTR_MODE)) mutex_exit(&attrzp->z_acl_lock); mutex_exit(&attrzp->z_lock); } diff --git a/kernel/fs/zfs/zfs_znode.c b/kernel/fs/zfs/zfs_znode.c index 014a14d60d..7485f9dab3 100644 --- a/kernel/fs/zfs/zfs_znode.c +++ b/kernel/fs/zfs/zfs_znode.c @@ -409,7 +409,7 @@ zfs_create_share_dir(zfsvfs_t *zfsvfs, dmu_tx_t *tx) znode_t *zp; int error; - vattr.va_mask = AT_MODE|AT_UID|AT_GID|AT_TYPE; + vattr.va_mask = VATTR_MODE|VATTR_UID|VATTR_GID|VATTR_TYPE; vattr.va_type = VDIR; vattr.va_mode = S_IFDIR|0555; vattr.va_uid = crgetuid(kcred); @@ -709,7 +709,7 @@ zfs_mknode(znode_t *dzp, vattr_t *vap, dmu_tx_t *tx, cred_t *cr, int cnt = 0; zfs_acl_locator_cb_t locate = { 0 }; - ASSERT(vap && (vap->va_mask & (AT_TYPE|AT_MODE)) == (AT_TYPE|AT_MODE)); + ASSERT(vap && (vap->va_mask & (VATTR_TYPE|VATTR_MODE)) == (VATTR_TYPE|VATTR_MODE)); if (zfsvfs->z_replay) { obj = vap->va_nodeid; @@ -807,13 +807,13 @@ zfs_mknode(znode_t *dzp, vattr_t *vap, dmu_tx_t *tx, cred_t *cr, ZFS_TIME_ENCODE(&now, crtime); ZFS_TIME_ENCODE(&now, ctime); - if (vap->va_mask & AT_ATIME) { + if (vap->va_mask & VATTR_ATIME) { ZFS_TIME_ENCODE(&vap->va_atime, atime); } else { ZFS_TIME_ENCODE(&now, atime); } - if (vap->va_mask & AT_MTIME) { + if (vap->va_mask & VATTR_MTIME) { ZFS_TIME_ENCODE(&vap->va_mtime, mtime); } else { ZFS_TIME_ENCODE(&now, mtime); @@ -924,7 +924,7 @@ zfs_mknode(znode_t *dzp, vattr_t *vap, dmu_tx_t *tx, cred_t *cr, (*zpp)->z_pflags = pflags; (*zpp)->z_mode = mode; - if (vap->va_mask & AT_XVATTR) + if (vap->va_mask & VATTR_XVATTR) zfs_xvattr_set(*zpp, (xvattr_t *)vap, tx); if (obj_type == DMU_OT_ZNODE || @@ -1319,11 +1319,11 @@ zfs_tstamp_update_setup(znode_t *zp, uint_t flag, uint64_t mtime[2], zp->z_atime_dirty = 1; } - if (flag & AT_ATIME) { + if (flag & VATTR_ATIME) { ZFS_TIME_ENCODE(&now, zp->z_atime); } - if (flag & AT_MTIME) { + if (flag & VATTR_MTIME) { ZFS_TIME_ENCODE(&now, mtime); if (zp->z_zfsvfs->z_use_fuids) { zp->z_pflags |= (ZFS_ARCHIVE | @@ -1331,7 +1331,7 @@ zfs_tstamp_update_setup(znode_t *zp, uint_t flag, uint64_t mtime[2], } } - if (flag & AT_CTIME) { + if (flag & VATTR_CTIME) { ZFS_TIME_ENCODE(&now, ctime); if (zp->z_zfsvfs->z_use_fuids) zp->z_pflags |= ZFS_ARCHIVE; @@ -1752,7 +1752,7 @@ zfs_create_fs(objset_t *os, cred_t *cr, nvlist_t *zplprops, dmu_tx_t *tx) * Create root znode. Create minimal znode/vnode/zfsvfs * to allow zfs_mknode to work. */ - vattr.va_mask = AT_MODE|AT_UID|AT_GID|AT_TYPE; + vattr.va_mask = VATTR_MODE|VATTR_UID|VATTR_GID|VATTR_TYPE; vattr.va_type = VDIR; vattr.va_mode = S_IFDIR|0755; vattr.va_uid = crgetuid(cr); diff --git a/kernel/os/acct.c b/kernel/os/acct.c index 5672b0401e..b777a8a497 100644 --- a/kernel/os/acct.c +++ b/kernel/os/acct.c @@ -429,7 +429,7 @@ acct(char st) * exceeding the 2GB limit as none of the accounting commands are * currently large file aware. */ - va.va_mask = AT_SIZE; + va.va_mask = VATTR_SIZE; if (fop_getattr(vp, &va, 0, kcred, NULL) == 0) { error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&ag->acctbuf, sizeof (ag->acctbuf), 0LL, UIO_SYSSPACE, FAPPEND, diff --git a/kernel/os/core.c b/kernel/os/core.c index a147c6ef3d..9601ae50c1 100644 --- a/kernel/os/core.c +++ b/kernel/os/core.c @@ -264,7 +264,7 @@ create_core_file(char *fp, enum core_types core_type, vnode_t **vpp) /* * Don't dump a core file owned by "nobody". */ - vattr.va_mask = AT_UID; + vattr.va_mask = VATTR_UID; if (error == 0 && (fop_getattr(vp, &vattr, 0, credp, NULL) != 0 || vattr.va_uid != crgetuid(credp))) { diff --git a/kernel/os/dumpsubr.c b/kernel/os/dumpsubr.c index 93a4b3a340..7b26141d3e 100644 --- a/kernel/os/dumpsubr.c +++ b/kernel/os/dumpsubr.c @@ -430,7 +430,7 @@ dumpinit(vnode_t *vp, char *name, int justchecking) if ((error = fop_open(&cvp, FREAD | FWRITE, kcred, NULL)) != 0) return (error); - vattr.va_mask = AT_SIZE | AT_TYPE | AT_RDEV; + vattr.va_mask = VATTR_SIZE | VATTR_TYPE | VATTR_RDEV; if ((error = fop_getattr(cvp, &vattr, 0, kcred, NULL)) == 0) { if (vattr.va_type == VBLK || vattr.va_type == VCHR) { if (devopsp[getmajor(vattr.va_rdev)]-> @@ -536,7 +536,7 @@ dumpfini(void) /* * Determine if we are using zvols for our dump device */ - vattr.va_mask = AT_RDEV; + vattr.va_mask = VATTR_RDEV; if (fop_getattr(dumpvp, &vattr, 0, kcred, NULL) == 0) { is_zfs = (getmajor(vattr.va_rdev) == ddi_name_to_major(ZFS_DRIVER)) ? B_TRUE : B_FALSE; @@ -1342,7 +1342,7 @@ dumpvp_resize() vattr_t vattr; mutex_enter(&dump_lock); - vattr.va_mask = AT_SIZE; + vattr.va_mask = VATTR_SIZE; if ((error = fop_getattr(dumpvp, &vattr, 0, kcred, NULL)) != 0) { mutex_exit(&dump_lock); return (error); diff --git a/kernel/os/exacct.c b/kernel/os/exacct.c index e82be1670e..cfb6685ed5 100644 --- a/kernel/os/exacct.c +++ b/kernel/os/exacct.c @@ -166,7 +166,7 @@ exacct_vn_write_impl(ac_info_t *info, void *buf, ssize_t bufsize) * Save the size. If vn_rdwr fails, reset the size to avoid corrupting * the present accounting file. */ - va.va_mask = AT_SIZE; + va.va_mask = VATTR_SIZE; error = fop_getattr(info->ac_vnode, &va, 0, kcred, NULL); if (error == 0) { error = vn_rdwr(UIO_WRITE, info->ac_vnode, (caddr_t)buf, diff --git a/kernel/os/exec.c b/kernel/os/exec.c index 595ab26caf..f0254c3c3d 100644 --- a/kernel/os/exec.c +++ b/kernel/os/exec.c @@ -1127,7 +1127,7 @@ execpermissions(struct vnode *vp, struct vattr *vattrp, struct uarg *args) int error; proc_t *p = ttoproc(curthread); - vattrp->va_mask = AT_MODE | AT_UID | AT_GID | AT_SIZE; + vattrp->va_mask = VATTR_MODE | VATTR_UID | VATTR_GID | VATTR_SIZE; if (error = fop_getattr(vp, vattrp, ATTR_EXEC, p->p_cred, NULL)) return (error); /* diff --git a/kernel/os/fio.c b/kernel/os/fio.c index 7efea558b5..99472064a0 100644 --- a/kernel/os/fio.c +++ b/kernel/os/fio.c @@ -1544,7 +1544,7 @@ fsetattrat(int fd, char *path, int flags, struct vattr *vap) * Since we are never called to set the size of a file, we don't * need to check for non-blocking locks (via nbl_need_check(vp)). */ - ASSERT(!(vap->va_mask & AT_SIZE)); + ASSERT(!(vap->va_mask & VATTR_SIZE)); if ((error = fgetstartvp(fd, path, &startvp)) != 0) return (error); diff --git a/kernel/os/flock.c b/kernel/os/flock.c index 7dc7126a51..cd8cce28d6 100644 --- a/kernel/os/flock.c +++ b/kernel/os/flock.c @@ -2781,7 +2781,7 @@ convoff(struct vnode *vp, struct flock64 *lckdat, int whence, offset_t offset) struct vattr vattr; if ((lckdat->l_whence == 2) || (whence == 2)) { - vattr.va_mask = AT_SIZE; + vattr.va_mask = VATTR_SIZE; if (error = fop_getattr(vp, &vattr, 0, CRED(), NULL)) return (error); } @@ -3586,7 +3586,7 @@ flk_convert_lock_data(vnode_t *vp, flock64_t *flp, *start = (uoff_t)(flp->l_start + offset); break; case 2: /* SEEK_END */ - vattr.va_mask = AT_SIZE; + vattr.va_mask = VATTR_SIZE; if (error = fop_getattr(vp, &vattr, 0, CRED(), NULL)) return (error); *start = (uoff_t)(flp->l_start + vattr.va_size); diff --git a/kernel/os/mmapobj.c b/kernel/os/mmapobj.c index 09deae93fd..02c8e19263 100644 --- a/kernel/os/mmapobj.c +++ b/kernel/os/mmapobj.c @@ -916,7 +916,7 @@ mmapobj_map_flat(vnode_t *vp, mmapobj_result_t *mrp, size_t padding, ma_flags = 0; } - vattr.va_mask = AT_SIZE; + vattr.va_mask = VATTR_SIZE; error = fop_getattr(vp, &vattr, 0, fcred, NULL); if (error) { return (error); @@ -1591,7 +1591,7 @@ process_phdrs(Ehdr *ehdrp, caddr_t phdrbase, int nphdrs, mmapobj_result_t *mrp, use_lib_va = 0; } if (e_type == ET_DYN) { - vattr.va_mask = AT_FSID | AT_NODEID | AT_CTIME | AT_MTIME; + vattr.va_mask = VATTR_FSID | VATTR_NODEID | VATTR_CTIME | VATTR_MTIME; error = fop_getattr(vp, &vattr, 0, fcred, NULL); if (error) { return (error); @@ -2077,7 +2077,7 @@ mmapobj_map_interpret(vnode_t *vp, mmapobj_result_t *mrp, ulong_t lheader[(MAX_HEADER_SIZE / (sizeof (ulong_t))) + 1]; caddr_t header = (caddr_t)&lheader; - vattr.va_mask = AT_FSID | AT_NODEID | AT_CTIME | AT_MTIME | AT_SIZE; + vattr.va_mask = VATTR_FSID | VATTR_NODEID | VATTR_CTIME | VATTR_MTIME | VATTR_SIZE; error = fop_getattr(vp, &vattr, 0, fcred, NULL); if (error) { return (error); diff --git a/kernel/os/policy.c b/kernel/os/policy.c index 1588fcae31..16f10c4abf 100644 --- a/kernel/os/policy.c +++ b/kernel/os/policy.c @@ -692,7 +692,7 @@ secpolicy_fs_common(cred_t *cr, vnode_t *mvp, const vfs_t *vfsp, vattr_t va; int err; - va.va_mask = AT_UID|AT_MODE; + va.va_mask = VATTR_UID|VATTR_MODE; err = fop_getattr(mvp, &va, 0, cr, NULL); if (err != 0) return (err); @@ -1215,8 +1215,8 @@ secpolicy_setid_clear(vattr_t *vap, cred_t *cr) if ((vap->va_mode & (S_ISUID | S_ISGID)) != 0 && secpolicy_vnode_setid_retain(cr, (vap->va_mode & S_ISUID) != 0 && - (vap->va_mask & AT_UID) != 0 && vap->va_uid == 0) != 0) { - vap->va_mask |= AT_MODE; + (vap->va_mask & VATTR_UID) != 0 && vap->va_uid == 0) != 0) { + vap->va_mask |= VATTR_MODE; vap->va_mode &= ~(S_ISUID|S_ISGID); } } @@ -1343,11 +1343,11 @@ secpolicy_xvattr(xvattr_t *xvap, uid_t owner, cred_t *cr, vtype_t vtype) * - permission to add sticky bit to non-directory * - permission to add set-gid bit * - * The ovap argument should include AT_MODE|AT_UID|AT_GID. + * The ovap argument should include VATTR_MODE|VATTR_UID|VATTR_GID. * - * If the vap argument does not include AT_MODE, the mode will be copied from + * If the vap argument does not include VATTR_MODE, the mode will be copied from * ovap. In certain situations set-uid/set-gid bits need to be removed; - * this is done by marking vap->va_mask to include AT_MODE and va_mode + * this is done by marking vap->va_mask to include VATTR_MODE and va_mode * is updated to the newly computed mode. */ @@ -1361,7 +1361,7 @@ secpolicy_vnode_setattr(cred_t *cr, struct vnode *vp, struct vattr *vap, int error = 0; boolean_t skipaclchk = (flags & ATTR_NOACLCHECK) ? B_TRUE : B_FALSE; - if (mask & AT_SIZE) { + if (mask & VATTR_SIZE) { if (vp->v_type == VDIR) { error = EISDIR; goto out; @@ -1378,7 +1378,7 @@ secpolicy_vnode_setattr(cred_t *cr, struct vnode *vp, struct vattr *vap, goto out; } } - if (mask & AT_MODE) { + if (mask & VATTR_MODE) { /* * If not the owner of the file then check privilege * for two things: the privilege to set the mode at all @@ -1396,7 +1396,7 @@ secpolicy_vnode_setattr(cred_t *cr, struct vnode *vp, struct vattr *vap, } else vap->va_mode = ovap->va_mode; - if (mask & (AT_UID|AT_GID)) { + if (mask & (VATTR_UID|VATTR_GID)) { boolean_t checkpriv = B_FALSE; /* @@ -1418,8 +1418,8 @@ secpolicy_vnode_setattr(cred_t *cr, struct vnode *vp, struct vattr *vap, if (cr->cr_uid != ovap->va_uid) { checkpriv = B_TRUE; } else { - if (((mask & AT_UID) && vap->va_uid != ovap->va_uid) || - ((mask & AT_GID) && vap->va_gid != ovap->va_gid && + if (((mask & VATTR_UID) && vap->va_uid != ovap->va_uid) || + ((mask & VATTR_GID) && vap->va_gid != ovap->va_gid && !groupmember(vap->va_gid, cr))) { checkpriv = B_TRUE; } @@ -1438,7 +1438,7 @@ secpolicy_vnode_setattr(cred_t *cr, struct vnode *vp, struct vattr *vap, */ secpolicy_setid_clear(vap, cr); } - if (mask & (AT_ATIME|AT_MTIME)) { + if (mask & (VATTR_ATIME|VATTR_MTIME)) { /* * If not the file owner and not otherwise privileged, * always return an error when setting the @@ -1463,7 +1463,7 @@ secpolicy_vnode_setattr(cred_t *cr, struct vnode *vp, struct vattr *vap, /* * Check for optional attributes here by checking the following: */ - if (mask & AT_XVATTR) + if (mask & VATTR_XVATTR) error = secpolicy_xvattr((xvattr_t *)vap, ovap->va_uid, cr, vp->v_type); out: diff --git a/kernel/os/urw.c b/kernel/os/urw.c index 220ebf9eb7..72a34e9d04 100644 --- a/kernel/os/urw.c +++ b/kernel/os/urw.c @@ -68,7 +68,7 @@ page_valid(struct seg *seg, caddr_t addr) * Fail if the page doesn't map to a page in the underlying * mapped file, if an underlying mapped file exists. */ - vattr.va_mask = AT_SIZE; + vattr.va_mask = VATTR_SIZE; if (seg->s_ops == &segvn_ops && segop_getvp(seg, addr, &vp) == 0 && vp != NULL && vp->v_type == VREG && diff --git a/kernel/syscall/acctctl.c b/kernel/syscall/acctctl.c index 16f7466720..bed044ed4f 100644 --- a/kernel/syscall/acctctl.c +++ b/kernel/syscall/acctctl.c @@ -296,7 +296,7 @@ ac_file_set(ac_info_t *info, void *ubuf, size_t bufsz) /* * Write the exacct header only if the file is empty. */ - error = fop_getattr(info->ac_vnode, &va, AT_SIZE, CRED(), NULL); + error = fop_getattr(info->ac_vnode, &va, VATTR_SIZE, CRED(), NULL); if (error == 0 && va.va_size == 0) error = exacct_write_header(info, hdr, hdrsize); diff --git a/kernel/syscall/chdir.c b/kernel/syscall/chdir.c index e7c400e2d9..a2c9653799 100644 --- a/kernel/syscall/chdir.c +++ b/kernel/syscall/chdir.c @@ -196,11 +196,11 @@ chdirec(vnode_t *vp, int ischroot, int do_traverse) struct vattr rattr; vnode_t *zonevp = curproc->p_zone->zone_rootvp; - tattr.va_mask = AT_FSID|AT_NODEID; + tattr.va_mask = VATTR_FSID|VATTR_NODEID; if (error = fop_getattr(vp, &tattr, 0, CRED(), NULL)) goto bad; - rattr.va_mask = AT_FSID|AT_NODEID; + rattr.va_mask = VATTR_FSID|VATTR_NODEID; if (error = fop_getattr(zonevp, &rattr, 0, CRED(), NULL)) goto bad; diff --git a/kernel/syscall/chmod.c b/kernel/syscall/chmod.c index feb5418ab4..aa84b41d60 100644 --- a/kernel/syscall/chmod.c +++ b/kernel/syscall/chmod.c @@ -59,7 +59,7 @@ fchmodat(int fd, char *path, int mode, int flag) return (set_errno(EOPNOTSUPP)); vattr.va_mode = mode & MODEMASK; - vattr.va_mask = AT_MODE; + vattr.va_mask = VATTR_MODE; error = fsetattrat(fd, path, flag, &vattr); if (error) return (set_errno(error)); diff --git a/kernel/syscall/chown.c b/kernel/syscall/chown.c index 0ea532653d..72fe537081 100644 --- a/kernel/syscall/chown.c +++ b/kernel/syscall/chown.c @@ -69,9 +69,9 @@ fchownat(int fd, char *path, uid_t uid, gid_t gid, int flag) vattr.va_gid = gid; vattr.va_mask = 0; if (vattr.va_uid != -1) - vattr.va_mask |= AT_UID; + vattr.va_mask |= VATTR_UID; if (vattr.va_gid != -1) - vattr.va_mask |= AT_GID; + vattr.va_mask |= VATTR_GID; error = fsetattrat(fd, path, flag, &vattr); if (error) diff --git a/kernel/syscall/fcntl.c b/kernel/syscall/fcntl.c index 0e17fc56cb..4bd3eafab2 100644 --- a/kernel/syscall/fcntl.c +++ b/kernel/syscall/fcntl.c @@ -612,7 +612,7 @@ fcntl(int fdes, int cmd, intptr_t arg) nbl_start_crit(vp, RW_READER); in_crit = 1; - vattr.va_mask = AT_SIZE; + vattr.va_mask = VATTR_SIZE; if ((error = fop_getattr(vp, &vattr, 0, CRED(), NULL)) != 0) break; @@ -849,7 +849,7 @@ flock_check(vnode_t *vp, flock64_t *flp, offset_t offset, offset_t max) return (EINVAL); break; case 2: /* SEEK_END */ - vattr.va_mask = AT_SIZE; + vattr.va_mask = VATTR_SIZE; if (error = fop_getattr(vp, &vattr, 0, CRED(), NULL)) return (error); if (flp->l_start > (max - (offset_t)vattr.va_size)) @@ -913,7 +913,7 @@ flock_get_start(vnode_t *vp, flock64_t *flp, offset_t offset, uoff_t *start) *start = (uoff_t)(flp->l_start + offset); break; case 2: /* SEEK_END */ - vattr.va_mask = AT_SIZE; + vattr.va_mask = VATTR_SIZE; if (error = fop_getattr(vp, &vattr, 0, CRED(), NULL)) return (error); *start = (uoff_t)(flp->l_start + (offset_t)vattr.va_size); diff --git a/kernel/syscall/ioctl.c b/kernel/syscall/ioctl.c index 988031d949..dfc804e26c 100644 --- a/kernel/syscall/ioctl.c +++ b/kernel/syscall/ioctl.c @@ -88,7 +88,7 @@ ioctl(int fdes, int cmd, intptr_t arg) */ int32_t offset; - vattr.va_mask = AT_SIZE; + vattr.va_mask = VATTR_SIZE; error = fop_getattr(vp, &vattr, 0, fp->f_cred, NULL); if (error) { releasef(fdes); diff --git a/kernel/syscall/lseek.c b/kernel/syscall/lseek.c index 623539e38c..488fd099e8 100644 --- a/kernel/syscall/lseek.c +++ b/kernel/syscall/lseek.c @@ -111,7 +111,7 @@ lseek32_common(file_t *fp, int stype, offset_t off, offset_t max, break; case SEEK_END: - vattr.va_mask = AT_SIZE; + vattr.va_mask = VATTR_SIZE; if (error = fop_getattr(vp, &vattr, 0, fp->f_cred, NULL)) { goto out; } @@ -141,7 +141,7 @@ lseek32_common(file_t *fp, int stype, offset_t off, offset_t max, * The ioctl is not supported, check the supplied * "off" is not past the end of file */ - vattr.va_mask = AT_SIZE; + vattr.va_mask = VATTR_SIZE; error = fop_getattr(vp, &vattr, 0, fp->f_cred, NULL); if (error) return (error); @@ -170,7 +170,7 @@ lseek32_common(file_t *fp, int stype, offset_t off, offset_t max, * ioctl is not supported, if the off is valid return * the "virtual hole" at the end of the file. */ - vattr.va_mask = AT_SIZE; + vattr.va_mask = VATTR_SIZE; error = fop_getattr(vp, &vattr, 0, fp->f_cred, NULL); if (error) return (error); @@ -292,7 +292,7 @@ lseek64(int fdes, off_t off, int stype) break; case SEEK_END: - vattr.va_mask = AT_SIZE; + vattr.va_mask = VATTR_SIZE; if ((error = fop_getattr(vp, &vattr, 0, fp->f_cred, NULL)) != 0) goto lseek64error; new_off += vattr.va_size; @@ -317,7 +317,7 @@ lseek64(int fdes, off_t off, int stype) * The ioctl is not supported, check the supplied off * is not past end of file */ - vattr.va_mask = AT_SIZE; + vattr.va_mask = VATTR_SIZE; error = fop_getattr(vp, &vattr, 0, fp->f_cred, NULL); if (error) goto lseek64error; @@ -345,7 +345,7 @@ lseek64(int fdes, off_t off, int stype) * ioctl is not supported, if the off is valid return * the "virtual hole" at the end of the file. */ - vattr.va_mask = AT_SIZE; + vattr.va_mask = VATTR_SIZE; error = fop_getattr(vp, &vattr, 0, fp->f_cred, NULL); if (error) goto lseek64error; diff --git a/kernel/syscall/mkdir.c b/kernel/syscall/mkdir.c index ce21aaffc2..c8b3ce447b 100644 --- a/kernel/syscall/mkdir.c +++ b/kernel/syscall/mkdir.c @@ -58,7 +58,7 @@ mkdirat(int fd, char *dname, int dmode) vattr.va_type = VDIR; vattr.va_mode = dmode & PERMMASK; - vattr.va_mask = AT_TYPE|AT_MODE; + vattr.va_mask = VATTR_TYPE|VATTR_MODE; if (dname == NULL) return (set_errno(EFAULT)); diff --git a/kernel/syscall/mknod.c b/kernel/syscall/mknod.c index 2160971d94..8f39ed10a5 100644 --- a/kernel/syscall/mknod.c +++ b/kernel/syscall/mknod.c @@ -80,14 +80,14 @@ mknodat(int fd, char *fname, mode_t fmode, dev_t dev) */ vattr.va_type = IFTOVT(fmode); vattr.va_mode = fmode & MODEMASK; - vattr.va_mask = AT_TYPE|AT_MODE; + vattr.va_mask = VATTR_TYPE|VATTR_MODE; if (vattr.va_type == VCHR || vattr.va_type == VBLK) { if (get_udatamodel() != DATAMODEL_NATIVE) dev = expldev(dev); if (dev == NODEV || (getemajor(dev)) == (major_t)NODEV) return (set_errno(EINVAL)); vattr.va_rdev = dev; - vattr.va_mask |= AT_RDEV; + vattr.va_mask |= VATTR_RDEV; } if (fname == NULL) diff --git a/kernel/syscall/open.c b/kernel/syscall/open.c index 139d46ab38..81bb14820a 100644 --- a/kernel/syscall/open.c +++ b/kernel/syscall/open.c @@ -178,7 +178,7 @@ copen(int startfd, char *fname, int filemode, int createmode) * In order to access hidden attribute directory the * user must be able to stat() the file */ - vattr.va_mask = AT_ALL; + vattr.va_mask = VATTR_ALL; if (error = fop_getattr(startvp, &vattr, 0, CRED(), NULL)) { pn_free(&pn); goto out; diff --git a/kernel/syscall/readlink.c b/kernel/syscall/readlink.c index 6483686b66..bad4c1dd87 100644 --- a/kernel/syscall/readlink.c +++ b/kernel/syscall/readlink.c @@ -84,7 +84,7 @@ lookup: * Ask the underlying filesystem if it wants this * object to look like a symlink at user-level. */ - vattr.va_mask = AT_TYPE; + vattr.va_mask = VATTR_TYPE; error = fop_getattr(vp, &vattr, 0, CRED(), NULL); if (error || vattr.va_type != VLNK) { VN_RELE(vp); diff --git a/kernel/syscall/rw.c b/kernel/syscall/rw.c index 05cc6d949b..a3e8d012e9 100644 --- a/kernel/syscall/rw.c +++ b/kernel/syscall/rw.c @@ -139,7 +139,7 @@ read(int fdes, void *cbuf, size_t count) fileoff = (uoff_t)fp->f_offset; if (fileoff >= OFFSET_MAX(fp) && (vp->v_type == VREG)) { struct vattr va; - va.va_mask = AT_SIZE; + va.va_mask = VATTR_SIZE; if ((error = fop_getattr(vp, &va, 0, fp->f_cred, NULL))) { fop_rwunlock(vp, rwflag, NULL); goto out; @@ -417,7 +417,7 @@ pread(int fdes, void *cbuf, size_t count, off_t offset) (void) fop_rwlock(vp, rwflag, NULL); if (vp->v_type == VREG && fileoff == (uoff_t)maxoff) { struct vattr va; - va.va_mask = AT_SIZE; + va.va_mask = VATTR_SIZE; if ((error = fop_getattr(vp, &va, 0, fp->f_cred, NULL))) { fop_rwunlock(vp, rwflag, NULL); goto out; @@ -735,7 +735,7 @@ readv(int fdes, struct iovec *iovp, int iovcnt) if ((vp->v_type == VREG) && (fileoff >= OFFSET_MAX(fp))) { struct vattr va; - va.va_mask = AT_SIZE; + va.va_mask = VATTR_SIZE; if ((error = fop_getattr(vp, &va, 0, fp->f_cred, NULL))) { fop_rwunlock(vp, rwflag, NULL); goto out; @@ -1146,7 +1146,7 @@ preadv(int fdes, struct iovec *iovp, int iovcnt, off_t offset, if ((vp->v_type == VREG) && (fileoff >= OFFSET_MAX(fp))) { struct vattr va; - va.va_mask = AT_SIZE; + va.va_mask = VATTR_SIZE; if ((error = fop_getattr(vp, &va, 0, fp->f_cred, NULL))) { fop_rwunlock(vp, rwflag, NULL); diff --git a/kernel/syscall/sendfile.c b/kernel/syscall/sendfile.c index cc7b6b7288..9d20aae8dc 100644 --- a/kernel/syscall/sendfile.c +++ b/kernel/syscall/sendfile.c @@ -959,7 +959,7 @@ sendvec_chunk(file_t *fp, uoff_t *fileoff, struct sendfilevec *sfv, struct vattr va; boolean_t nowait; - va.va_mask = AT_SIZE; + va.va_mask = VATTR_SIZE; error = fop_getattr(readvp, &va, 0, kcred, NULL); if (error != 0 || sfv_off >= va.va_size) { diff --git a/kernel/syscall/stat.c b/kernel/syscall/stat.c index 768722d459..7325e9b1a9 100644 --- a/kernel/syscall/stat.c +++ b/kernel/syscall/stat.c @@ -186,7 +186,7 @@ cstat(vnode_t *vp, struct stat *ubp, int flag, cred_t *cr) vattr_t vattr; int error; - vattr.va_mask = AT_STAT | AT_NBLOCKS | AT_BLKSIZE | AT_SIZE; + vattr.va_mask = VATTR_STAT | VATTR_NBLOCKS | VATTR_BLKSIZE | VATTR_SIZE; if ((error = fop_getattr(vp, &vattr, flag, cr, NULL)) != 0) return (error); #ifdef _ILP32 @@ -305,7 +305,7 @@ cstat32(vnode_t *vp, struct stat32 *ubp, int flag, struct cred *cr) int error; dev32_t st_dev, st_rdev; - vattr.va_mask = AT_STAT | AT_NBLOCKS | AT_BLKSIZE | AT_SIZE; + vattr.va_mask = VATTR_STAT | VATTR_NBLOCKS | VATTR_BLKSIZE | VATTR_SIZE; if (error = fop_getattr(vp, &vattr, flag, cr, NULL)) return (error); @@ -419,7 +419,7 @@ cstat64(vnode_t *vp, struct stat64 *ubp, int flag, cred_t *cr) vattr_t vattr; int error; - vattr.va_mask = AT_STAT | AT_NBLOCKS | AT_BLKSIZE | AT_SIZE; + vattr.va_mask = VATTR_STAT | VATTR_NBLOCKS | VATTR_BLKSIZE | VATTR_SIZE; if (error = fop_getattr(vp, &vattr, flag, cr, NULL)) return (error); @@ -519,7 +519,7 @@ cstat64_32(vnode_t *vp, struct stat64_32 *ubp, int flag, cred_t *cr) int error; dev32_t st_dev, st_rdev; - vattr.va_mask = AT_STAT | AT_NBLOCKS | AT_BLKSIZE | AT_SIZE; + vattr.va_mask = VATTR_STAT | VATTR_NBLOCKS | VATTR_BLKSIZE | VATTR_SIZE; if (error = fop_getattr(vp, &vattr, flag, cr, NULL)) return (error); diff --git a/kernel/syscall/symlink.c b/kernel/syscall/symlink.c index 0c92655e3a..ddf71d2866 100644 --- a/kernel/syscall/symlink.c +++ b/kernel/syscall/symlink.c @@ -90,7 +90,7 @@ top: if ((error = copyinstr(target, tbuf, MAXPATHLEN, &tlen)) == 0) { vattr.va_type = VLNK; vattr.va_mode = 0777; - vattr.va_mask = AT_TYPE|AT_MODE; + vattr.va_mask = VATTR_TYPE|VATTR_MODE; error = fop_symlink(dvp, lpn.pn_path, &vattr, tbuf, CRED(), NULL, 0); if (auditing) diff --git a/kernel/syscall/utime.c b/kernel/syscall/utime.c index a1ab521864..ae7698dbcb 100644 --- a/kernel/syscall/utime.c +++ b/kernel/syscall/utime.c @@ -138,7 +138,7 @@ get_timespec_vattr(timespec_t *tsptr, struct vattr *vattr, int *flags) if (ts[0].tv_nsec == UTIME_OMIT) { ts[0].tv_nsec = 0; } else { - mask |= AT_ATIME; + mask |= VATTR_ATIME; if (ts[0].tv_nsec == UTIME_NOW) ts[0] = now; else if (ts[0].tv_nsec < 0 || ts[0].tv_nsec >= NANOSEC) @@ -147,7 +147,7 @@ get_timespec_vattr(timespec_t *tsptr, struct vattr *vattr, int *flags) if (ts[1].tv_nsec == UTIME_OMIT) { ts[1].tv_nsec = 0; } else { - mask |= AT_MTIME; + mask |= VATTR_MTIME; if (ts[1].tv_nsec == UTIME_NOW) ts[1] = now; else if (ts[1].tv_nsec < 0 || ts[1].tv_nsec >= NANOSEC) @@ -161,7 +161,7 @@ get_timespec_vattr(timespec_t *tsptr, struct vattr *vattr, int *flags) gethrestime(&now); vattr->va_atime = now; vattr->va_mtime = now; - vattr->va_mask = AT_ATIME | AT_MTIME; + vattr->va_mask = VATTR_ATIME | VATTR_MTIME; *flags = 0; } diff --git a/kernel/vm/seg_vn.c b/kernel/vm/seg_vn.c index 31ca531d2b..93629d234c 100644 --- a/kernel/vm/seg_vn.c +++ b/kernel/vm/seg_vn.c @@ -3455,7 +3455,7 @@ segvn_fill_vp_pages(struct segvn_data *svd, vnode_t *vp, uoff_t off, * be truncated after we check its size here. * XXX fix NFS to remove this check. */ - va.va_mask = AT_SIZE; + va.va_mask = VATTR_SIZE; if (fop_getattr(vp, &va, ATTR_HINT, svd->cred, NULL)) { VM_STAT_ADD(segvnvmstats.fill_vp_pages[6]); page_unlock(targpp); @@ -3525,7 +3525,7 @@ segvn_fill_vp_pages(struct segvn_data *svd, vnode_t *vp, uoff_t off, if (io_pplist != NULL) { VM_STAT_ADD(segvnvmstats.fill_vp_pages[12]); io_len = eoff - io_off; - va.va_mask = AT_SIZE; + va.va_mask = VATTR_SIZE; if (fop_getattr(vp, &va, ATTR_HINT, svd->cred, NULL) != 0) { VM_STAT_ADD(segvnvmstats.fill_vp_pages[13]); goto out; @@ -4051,7 +4051,7 @@ segvn_fault_vnodepages(struct hat *hat, struct seg *seg, caddr_t lpgaddr, err = FC_MAKE_ERR(ierr); goto out; } - va.va_mask = AT_SIZE; + va.va_mask = VATTR_SIZE; if (fop_getattr(vp, &va, 0, svd->cred, NULL)) { SEGVN_VMSTAT_FLTVNPAGES(20); err = FC_MAKE_ERR(EIO); @@ -6275,7 +6275,7 @@ segvn_setpagesize(struct seg *seg, caddr_t addr, size_t len, uint_t szc) if (svd->vp != NULL && szc != 0) { struct vattr va; uoff_t eoffpage = svd->offset; - va.va_mask = AT_SIZE; + va.va_mask = VATTR_SIZE; eoffpage += seg->s_size; eoffpage = btopr(eoffpage); if (fop_getattr(svd->vp, &va, 0, svd->cred, NULL) != 0) { @@ -7707,7 +7707,7 @@ segvn_lockop(struct seg *seg, caddr_t addr, size_t len, * is mapped beyond the end of a file. */ if (error && svd->vp) { - va.va_mask = AT_SIZE; + va.va_mask = VATTR_SIZE; if (fop_getattr(svd->vp, &va, 0, svd->cred, NULL) != 0) { err = EIO; @@ -9545,7 +9545,7 @@ segvn_textrepl(struct seg *seg) * Avoid creating anon maps with size bigger than the file size. * If fop_getattr() call fails bail out. */ - va.va_mask = AT_SIZE | AT_MTIME | AT_CTIME; + va.va_mask = VATTR_SIZE | VATTR_MTIME | VATTR_CTIME; if (fop_getattr(vp, &va, 0, svd->cred, NULL) != 0) { svd->tr_state = SEGVN_TR_OFF; SEGVN_TR_ADDSTAT(gaerr); diff --git a/kernel/vm/vm_as.c b/kernel/vm/vm_as.c index 940de22f8e..84a8041647 100644 --- a/kernel/vm/vm_as.c +++ b/kernel/vm/vm_as.c @@ -1574,7 +1574,7 @@ again: return (error); } - va.va_mask = AT_SIZE; + va.va_mask = VATTR_SIZE; if (fop_getattr(vn_a->vp, &va, ATTR_HINT, vn_a->cred, NULL) != 0) { szcvec = 0; goto again; diff --git a/kernel/vm/vm_swap.c b/kernel/vm/vm_swap.c index c2deb298bf..b5cb52205f 100644 --- a/kernel/vm/vm_swap.c +++ b/kernel/vm/vm_swap.c @@ -1146,7 +1146,7 @@ swapadd(struct vnode *vp, ulong_t lowblk, ulong_t nblks, char *swapname) * available. This can happen if the system was built * on a machine with a different size swap partition. */ - vattr.va_mask = AT_SIZE; + vattr.va_mask = VATTR_SIZE; if (error = fop_getattr(cvp, &vattr, ATTR_COMM, CRED(), NULL)) goto out; @@ -1176,7 +1176,7 @@ swapadd(struct vnode *vp, ulong_t lowblk, ulong_t nblks, char *swapname) #endif /* _ILP32 */ /* Fail if file not writeable (try to set size to current size) */ - vattr.va_mask = AT_SIZE; + vattr.va_mask = VATTR_SIZE; if (error = fop_setattr(cvp, &vattr, 0, CRED(), NULL)) goto out; diff --git a/usr/src/cmd/zdb/zdb_il.c b/usr/src/cmd/zdb/zdb_il.c index a2ebe5857e..b907a41ad2 100644 --- a/usr/src/cmd/zdb/zdb_il.c +++ b/usr/src/cmd/zdb/zdb_il.c @@ -227,34 +227,34 @@ zil_prt_rec_setattr(zilog_t *zilog, int txtype, void *arg) (void) printf("%sfoid %llu, mask 0x%llx\n", tab_prefix, (u_longlong_t)lr->lr_foid, (u_longlong_t)lr->lr_mask); - if (lr->lr_mask & AT_MODE) { + if (lr->lr_mask & VATTR_MODE) { (void) printf("%sAT_MODE %llo\n", tab_prefix, (longlong_t)lr->lr_mode); } - if (lr->lr_mask & AT_UID) { + if (lr->lr_mask & VATTR_UID) { (void) printf("%sAT_UID %llu\n", tab_prefix, (u_longlong_t)lr->lr_uid); } - if (lr->lr_mask & AT_GID) { + if (lr->lr_mask & VATTR_GID) { (void) printf("%sAT_GID %llu\n", tab_prefix, (u_longlong_t)lr->lr_gid); } - if (lr->lr_mask & AT_SIZE) { + if (lr->lr_mask & VATTR_SIZE) { (void) printf("%sAT_SIZE %llu\n", tab_prefix, (u_longlong_t)lr->lr_size); } - if (lr->lr_mask & AT_ATIME) { + if (lr->lr_mask & VATTR_ATIME) { (void) printf("%sAT_ATIME %llu.%09llu %s", tab_prefix, (u_longlong_t)lr->lr_atime[0], (u_longlong_t)lr->lr_atime[1], ctime(&atime)); } - if (lr->lr_mask & AT_MTIME) { + if (lr->lr_mask & VATTR_MTIME) { (void) printf("%sAT_MTIME %llu.%09llu %s", tab_prefix, (u_longlong_t)lr->lr_mtime[0], (u_longlong_t)lr->lr_mtime[1], diff --git a/usr/src/lib/libzpool/common/sys/zfs_context.h b/usr/src/lib/libzpool/common/sys/zfs_context.h index 20e7f350fe..955622f181 100644 --- a/usr/src/lib/libzpool/common/sys/zfs_context.h +++ b/usr/src/lib/libzpool/common/sys/zfs_context.h @@ -458,22 +458,22 @@ typedef struct vsecattr { size_t vsa_aclentsz; /* ACE size in bytes of vsa_aclentp */ } vsecattr_t; -#define AT_TYPE 0x00001 -#define AT_MODE 0x00002 -#define AT_UID 0x00004 -#define AT_GID 0x00008 -#define AT_FSID 0x00010 -#define AT_NODEID 0x00020 -#define AT_NLINK 0x00040 -#define AT_SIZE 0x00080 -#define AT_ATIME 0x00100 -#define AT_MTIME 0x00200 -#define AT_CTIME 0x00400 -#define AT_RDEV 0x00800 -#define AT_BLKSIZE 0x01000 -#define AT_NBLOCKS 0x02000 -#define AT_SEQ 0x08000 -#define AT_XVATTR 0x10000 +#define VATTR_TYPE 0x00001 +#define VATTR_MODE 0x00002 +#define VATTR_UID 0x00004 +#define VATTR_GID 0x00008 +#define VATTR_FSID 0x00010 +#define VATTR_NODEID 0x00020 +#define VATTR_NLINK 0x00040 +#define VATTR_SIZE 0x00080 +#define VATTR_ATIME 0x00100 +#define VATTR_MTIME 0x00200 +#define VATTR_CTIME 0x00400 +#define VATTR_RDEV 0x00800 +#define VATTR_BLKSIZE 0x01000 +#define VATTR_NBLOCKS 0x02000 +#define VATTR_SEQ 0x08000 +#define VATTR_XVATTR 0x10000 #define CRCREAT 0 diff --git a/usr/src/stand/lib/fs/nfs/nfs2ops.c b/usr/src/stand/lib/fs/nfs/nfs2ops.c index c293b79688..e887b25883 100644 --- a/usr/src/stand/lib/fs/nfs/nfs2ops.c +++ b/usr/src/stand/lib/fs/nfs/nfs2ops.c @@ -203,27 +203,27 @@ nfsgetattr(struct nfs_file *nfp, struct vattr *vap) /* adapted from nattr_to_vattr() in nfs_client.c */ na = &getattr_res.attrstat_u.attributes; - if (vap->va_mask & AT_TYPE) { + if (vap->va_mask & VATTR_TYPE) { if (na->type < NFNON || na->type > NFSOCK) vap->va_type = VBAD; else vap->va_type = nf_to_vt[na->type]; } - if (vap->va_mask & AT_MODE) + if (vap->va_mask & VATTR_MODE) vap->va_mode = na->mode; - if (vap->va_mask & AT_SIZE) + if (vap->va_mask & VATTR_SIZE) vap->va_size = na->size; - if (vap->va_mask & AT_NODEID) + if (vap->va_mask & VATTR_NODEID) vap->va_nodeid = na->fileid; - if (vap->va_mask & AT_ATIME) { + if (vap->va_mask & VATTR_ATIME) { vap->va_atime.tv_sec = na->atime.seconds; vap->va_atime.tv_nsec = na->atime.useconds * 1000; } - if (vap->va_mask & AT_CTIME) { + if (vap->va_mask & VATTR_CTIME) { vap->va_ctime.tv_sec = na->ctime.seconds; vap->va_ctime.tv_nsec = na->ctime.useconds * 1000; } - if (vap->va_mask & AT_MTIME) { + if (vap->va_mask & VATTR_MTIME) { vap->va_mtime.tv_sec = na->mtime.seconds; vap->va_mtime.tv_nsec = na->mtime.useconds * 1000; } diff --git a/usr/src/stand/lib/fs/nfs/nfs3ops.c b/usr/src/stand/lib/fs/nfs/nfs3ops.c index 457849cf70..a548f53233 100644 --- a/usr/src/stand/lib/fs/nfs/nfs3ops.c +++ b/usr/src/stand/lib/fs/nfs/nfs3ops.c @@ -211,27 +211,27 @@ nfs3getattr(struct nfs_file *nfp, struct vattr *vap) } na = &getattr_res.GETATTR3res_u.resok.obj_attributes; - if (vap->va_mask & AT_TYPE) { + if (vap->va_mask & VATTR_TYPE) { if (na->type < NF3REG || na->type > NF3FIFO) vap->va_type = VBAD; else vap->va_type = nf3_to_vt[na->type]; } - if (vap->va_mask & AT_MODE) + if (vap->va_mask & VATTR_MODE) vap->va_mode = (mode_t)na->mode; - if (vap->va_mask & AT_SIZE) + if (vap->va_mask & VATTR_SIZE) vap->va_size = (uoff_t)na->size; - if (vap->va_mask & AT_NODEID) + if (vap->va_mask & VATTR_NODEID) vap->va_nodeid = (u_longlong_t)na->fileid; - if (vap->va_mask & AT_ATIME) { + if (vap->va_mask & VATTR_ATIME) { vap->va_atime.tv_sec = na->atime.seconds; vap->va_atime.tv_nsec = na->atime.nseconds; } - if (vap->va_mask & AT_CTIME) { + if (vap->va_mask & VATTR_CTIME) { vap->va_ctime.tv_sec = na->ctime.seconds; vap->va_ctime.tv_nsec = na->ctime.nseconds; } - if (vap->va_mask & AT_MTIME) { + if (vap->va_mask & VATTR_MTIME) { vap->va_mtime.tv_sec = na->mtime.seconds; vap->va_mtime.tv_nsec = na->mtime.nseconds; } diff --git a/usr/src/stand/lib/fs/nfs/nfs4ops.c b/usr/src/stand/lib/fs/nfs/nfs4ops.c index a6ae9cdb58..a93f26652a 100644 --- a/usr/src/stand/lib/fs/nfs/nfs4ops.c +++ b/usr/src/stand/lib/fs/nfs/nfs4ops.c @@ -238,32 +238,32 @@ nfs4getattr(struct nfs_file *nfp, struct vattr *vap) } bfattr4 = &getattrres.gr_attrs; - if (vap->va_mask & AT_TYPE) { + if (vap->va_mask & VATTR_TYPE) { if (bfattr4->b_fattr4_type < NF4REG || bfattr4->b_fattr4_type > NF4FIFO) vap->va_type = VBAD; else vap->va_type = nf4_to_vt[bfattr4->b_fattr4_type]; } - if (vap->va_mask & AT_MODE) + if (vap->va_mask & VATTR_MODE) vap->va_mode = (mode_t)bfattr4->b_fattr4_mode; - if (vap->va_mask & AT_SIZE) + if (vap->va_mask & VATTR_SIZE) vap->va_size = (uoff_t)bfattr4->b_fattr4_size; - if (vap->va_mask & AT_NODEID) + if (vap->va_mask & VATTR_NODEID) vap->va_nodeid = (uint64_t)bfattr4->b_fattr4_fileid; /* * XXX - may need to do something more here. */ - if (vap->va_mask & AT_ATIME) { + if (vap->va_mask & VATTR_ATIME) { vap->va_atime.tv_sec = bfattr4->b_fattr4_time_access.seconds; vap->va_atime.tv_nsec = bfattr4->b_fattr4_time_access.nseconds; } - if (vap->va_mask & AT_CTIME) { + if (vap->va_mask & VATTR_CTIME) { vap->va_ctime.tv_sec = bfattr4->b_fattr4_time_metadata.seconds; vap->va_ctime.tv_nsec = bfattr4->b_fattr4_time_metadata.nseconds; } - if (vap->va_mask & AT_MTIME) { + if (vap->va_mask & VATTR_MTIME) { vap->va_mtime.tv_sec = bfattr4->b_fattr4_time_modify.seconds; vap->va_mtime.tv_nsec = bfattr4->b_fattr4_time_modify.nseconds; } diff --git a/usr/src/stand/lib/fs/nfs/nfsops.c b/usr/src/stand/lib/fs/nfs/nfsops.c index 059d19946d..1bd4760e05 100644 --- a/usr/src/stand/lib/fs/nfs/nfsops.c +++ b/usr/src/stand/lib/fs/nfs/nfsops.c @@ -386,8 +386,8 @@ boot_nfs_fstat(int fd, struct bootstat *stp) return (-1); bzero((char *)&va, sizeof (va)); - va.va_mask = AT_TYPE | AT_SIZE | AT_MODE | AT_NODEID | - AT_ATIME | AT_CTIME | AT_MTIME; + va.va_mask = VATTR_TYPE | VATTR_SIZE | VATTR_MODE | VATTR_NODEID | + VATTR_ATIME | VATTR_CTIME | VATTR_MTIME; switch (filep->file.version) { case NFS_VERSION: diff --git a/usr/src/uts/common/c2/audit.c b/usr/src/uts/common/c2/audit.c index 817f8b1a4b..5f8f3d1bf0 100644 --- a/usr/src/uts/common/c2/audit.c +++ b/usr/src/uts/common/c2/audit.c @@ -109,7 +109,7 @@ audit_savepath( !(kctx->auk_policy & AUDIT_PUBLIC)) { struct vattr attr; - attr.va_mask = AT_ALL; + attr.va_mask = VATTR_ALL; if (fop_getattr(pvp, &attr, 0, CRED(), NULL) == 0) { if (object_is_public(&attr)) { tad->tad_ctrl |= TAD_NOAUDIT; @@ -456,7 +456,7 @@ audit_attributes(struct vnode *vp) tad = U2A(u); if (vp) { - attr.va_mask = AT_ALL; + attr.va_mask = VATTR_ALL; if (fop_getattr(vp, &attr, 0, CRED(), NULL) != 0) return; @@ -773,7 +773,7 @@ audit_closef(struct file *fp) * to build the audit record instead of the one off the thread. */ if ((vp = fp->f_vnode) != NULL) { - attr.va_mask = AT_ALL; + attr.va_mask = VATTR_ALL; if (fop_getattr(vp, &attr, 0, CRED(), NULL) == 0) { if ((fp->f_flag & FWRITE) == 0 && object_is_public(&attr)) { diff --git a/usr/src/uts/common/c2/audit_event.c b/usr/src/uts/common/c2/audit_event.c index 0b4840c900..7616f6b1c6 100644 --- a/usr/src/uts/common/c2/audit_event.c +++ b/usr/src/uts/common/c2/audit_event.c @@ -1977,7 +1977,7 @@ aus_close(struct t_audit_data *tad) if (fad->fad_aupath != NULL) { au_uwrite(au_to_path(fad->fad_aupath)); if ((vp = fp->f_vnode) != NULL) { - attr.va_mask = AT_ALL; + attr.va_mask = VATTR_ALL; if (fop_getattr(vp, &attr, 0, CRED(), NULL) == 0) { /* * When write was not used and the file can be diff --git a/usr/src/uts/common/fs/smbclnt/smbfs/smbfs_acl.c b/usr/src/uts/common/fs/smbclnt/smbfs/smbfs_acl.c index f09c36b861..d26acb1934 100644 --- a/usr/src/uts/common/fs/smbclnt/smbfs/smbfs_acl.c +++ b/usr/src/uts/common/fs/smbclnt/smbfs/smbfs_acl.c @@ -545,12 +545,12 @@ smbfs_acl_setids(vnode_t *vp, vattr_t *vap, cred_t *cr) uint32_t selector = 0; int error; - if (vap->va_mask & AT_UID) { + if (vap->va_mask & VATTR_UID) { selector |= OWNER_SECURITY_INFORMATION; uid = vap->va_uid; } - if (vap->va_mask & AT_GID) { + if (vap->va_mask & VATTR_GID) { selector |= GROUP_SECURITY_INFORMATION; gid = vap->va_gid; } diff --git a/usr/src/uts/common/fs/smbclnt/smbfs/smbfs_client.c b/usr/src/uts/common/fs/smbclnt/smbfs/smbfs_client.c index f7118e06b4..e02d84942a 100644 --- a/usr/src/uts/common/fs/smbclnt/smbfs/smbfs_client.c +++ b/usr/src/uts/common/fs/smbclnt/smbfs/smbfs_client.c @@ -465,13 +465,13 @@ smbfsgetattr(vnode_t *vp, struct vattr *vap, cred_t *cr) /* * If asked for UID or GID, update n_uid, n_gid. */ - mask = AT_ALL; - if (vap->va_mask & (AT_UID | AT_GID)) { + mask = VATTR_ALL; + if (vap->va_mask & (VATTR_UID | VATTR_GID)) { if (smi->smi_flags & SMI_ACL) (void) smbfs_acl_getids(vp, cr); /* else leave as set in make_smbnode */ } else { - mask &= ~(AT_UID | AT_GID); + mask &= ~(VATTR_UID | VATTR_GID); } /* @@ -491,7 +491,7 @@ smbfsgetattr(vnode_t *vp, struct vattr *vap, cred_t *cr) * smbfs_attrcache_fa, smbfs_getattr_otw */ smbfattr_to_vattr(vp, &fa, vap); - if (vap->va_mask & AT_XVATTR) + if (vap->va_mask & VATTR_XVATTR) smbfattr_to_xvattr(&fa, vap); return (0); diff --git a/usr/src/uts/common/fs/smbclnt/smbfs/smbfs_vnops.c b/usr/src/uts/common/fs/smbclnt/smbfs/smbfs_vnops.c index 8277f5c6c6..13e4ea9287 100644 --- a/usr/src/uts/common/fs/smbclnt/smbfs/smbfs_vnops.c +++ b/usr/src/uts/common/fs/smbclnt/smbfs/smbfs_vnops.c @@ -594,7 +594,7 @@ smbfs_read(vnode_t *vp, struct uio *uiop, int ioflag, cred_t *cr, return (EINVAL); /* get vnode attributes from server */ - va.va_mask = AT_SIZE | AT_MTIME; + va.va_mask = VATTR_SIZE | VATTR_MTIME; if (error = smbfsgetattr(vp, &va, cr)) return (error); @@ -759,7 +759,7 @@ smbfs_write(vnode_t *vp, struct uio *uiop, int ioflag, cred_t *cr, * Todo: Consider redesigning this to use a * handle opened for append instead. */ - va.va_mask = AT_SIZE; + va.va_mask = VATTR_SIZE; if (error = smbfsgetattr(vp, &va, cr)) return (error); uiop->uio_loffset = va.va_size; @@ -1459,13 +1459,13 @@ smbfs_getattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr, np = VTOSMB(vp); if (flags & ATTR_HINT) { if (vap->va_mask == - (vap->va_mask & (AT_SIZE | AT_FSID | AT_RDEV))) { + (vap->va_mask & (VATTR_SIZE | VATTR_FSID | VATTR_RDEV))) { mutex_enter(&np->r_statelock); - if (vap->va_mask | AT_SIZE) + if (vap->va_mask | VATTR_SIZE) vap->va_size = np->r_size; - if (vap->va_mask | AT_FSID) + if (vap->va_mask | VATTR_FSID) vap->va_fsid = vp->v_vfsp->vfs_dev; - if (vap->va_mask | AT_RDEV) + if (vap->va_mask | VATTR_RDEV) vap->va_rdev = vp->v_rdev; mutex_exit(&np->r_statelock); return (0); @@ -1478,7 +1478,7 @@ smbfs_getattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr, * * Here NFS also checks for async writes (np->r_awcount) */ - if (vap->va_mask & AT_MTIME) { + if (vap->va_mask & VATTR_MTIME) { if (vn_has_cached_data(vp) && ((np->r_flags & RDIRTY) != 0)) { mutex_enter(&np->r_statelock); @@ -1522,7 +1522,7 @@ smbfs_setattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr, return (EIO); mask = vap->va_mask; - if (mask & AT_NOSET) + if (mask & VATTR_NOSET) return (EINVAL); if (vfsp->vfs_flag & VFS_RDONLY) @@ -1535,11 +1535,11 @@ smbfs_setattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr, * need to check the _mount_ owner here. See _access_rwx */ bzero(&oldva, sizeof (oldva)); - oldva.va_mask = AT_TYPE | AT_MODE; + oldva.va_mask = VATTR_TYPE | VATTR_MODE; error = smbfsgetattr(vp, &oldva, cr); if (error) return (error); - oldva.va_mask |= AT_UID | AT_GID; + oldva.va_mask |= VATTR_UID | VATTR_GID; oldva.va_uid = smi->smi_uid; oldva.va_gid = smi->smi_gid; @@ -1548,7 +1548,7 @@ smbfs_setattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr, if (error) return (error); - if (mask & (AT_UID | AT_GID)) { + if (mask & (VATTR_UID | VATTR_GID)) { if (smi->smi_flags & SMI_ACL) error = smbfs_acl_setids(vp, vap, cr); else @@ -1569,7 +1569,7 @@ smbfs_setattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr, error = smbfssetattr(vp, vap, flags, cr); #ifdef SMBFS_VNEVENT - if (error == 0 && (vap->va_mask & AT_SIZE) && vap->va_size == 0) + if (error == 0 && (vap->va_mask & VATTR_SIZE) && vap->va_size == 0) vnevent_truncate(vp, ct); #endif @@ -1605,9 +1605,9 @@ smbfssetattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr) if (vp->v_flag & V_XATTRDIR) return (0); if (np->n_flag & N_XATTR) { - if (mask & AT_TIMES) + if (mask & VATTR_TIMES) SMBVDEBUG("ignore set time on xattr\n"); - mask &= AT_SIZE; + mask &= VATTR_SIZE; } /* @@ -1653,18 +1653,18 @@ smbfssetattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr) * map those into DOS attributes supported by SMB. * Note: zero means "no change". */ - if (mask & AT_XVATTR) + if (mask & VATTR_XVATTR) dosattr = xvattr_to_dosattr(np, vap); /* * Will we need an open handle for this setattr? * If so, what rights will we need? */ - if (dosattr || (mask & (AT_ATIME | AT_MTIME))) { + if (dosattr || (mask & (VATTR_ATIME | VATTR_MTIME))) { rights |= SA_RIGHT_FILE_WRITE_ATTRIBUTES; } - if (mask & AT_SIZE) { + if (mask & VATTR_SIZE) { rights |= SA_RIGHT_FILE_WRITE_DATA | SA_RIGHT_FILE_APPEND_DATA; @@ -1692,7 +1692,7 @@ smbfssetattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr) * For now we claim to have made any such changes. */ - if (mask & AT_SIZE) { + if (mask & VATTR_SIZE) { /* * If the new file size is less than what the client sees as * the file size, then just change the size and invalidate @@ -1724,8 +1724,8 @@ smbfssetattr(vnode_t *vp, struct vattr *vap, int flags, cred_t *cr) * Todo: Implement setting create_time (which is * different from ctime). */ - mtime = ((mask & AT_MTIME) ? &vap->va_mtime : 0); - atime = ((mask & AT_ATIME) ? &vap->va_atime : 0); + mtime = ((mask & VATTR_MTIME) ? &vap->va_mtime : 0); + atime = ((mask & VATTR_ATIME) ? &vap->va_atime : 0); if (dosattr || mtime || atime) { /* @@ -1772,7 +1772,7 @@ out: * back in. A read should be cheaper than a * write. */ - if (mask & AT_SIZE) { + if (mask & VATTR_SIZE) { smbfs_invalidate_pages(vp, (vap->va_size & PAGEMASK), cr); } @@ -1880,7 +1880,7 @@ smbfs_access_rwx(vfs_t *vfsp, int vtype, int mode, cred_t *cr) * Build our (fabricated) vnode attributes. */ bzero(&va, sizeof (va)); - va.va_mask = AT_TYPE | AT_MODE | AT_UID | AT_GID; + va.va_mask = VATTR_TYPE | VATTR_MODE | VATTR_UID | VATTR_GID; va.va_type = vtype; va.va_mode = (vtype == VDIR) ? smi->smi_dmode : smi->smi_fmode; @@ -2453,7 +2453,7 @@ smbfslookup_cache(vnode_t *dvp, char *nm, int nmlen, * this directory or file, we'll find out when we * try to open or get attributes. */ - va.va_mask = AT_TYPE | AT_MODE; + va.va_mask = VATTR_TYPE | VATTR_MODE; error = smbfsgetattr(dvp, &va, cr); if (error) { #ifdef DEBUG @@ -2611,7 +2611,7 @@ smbfs_create(vnode_t *dvp, char *nm, struct vattr *va, enum vcexcl exclusive, /* * Truncate (if requested). */ - if ((vattr.va_mask & AT_SIZE) && vp->v_type == VREG) { + if ((vattr.va_mask & VATTR_SIZE) && vp->v_type == VREG) { np = VTOSMB(vp); /* * Check here for large file truncation by @@ -2627,7 +2627,7 @@ smbfs_create(vnode_t *dvp, char *nm, struct vattr *va, enum vcexcl exclusive, VN_RELE(vp); goto out; } - vattr.va_mask = AT_SIZE; + vattr.va_mask = VATTR_SIZE; error = smbfssetattr(vp, &vattr, 0, cr); if (error) { VN_RELE(vp); @@ -2674,7 +2674,7 @@ smbfs_create(vnode_t *dvp, char *nm, struct vattr *va, enum vcexcl exclusive, else { /* Truncate regular files if requested. */ if ((va->va_type == VREG) && - (va->va_mask & AT_SIZE) && + (va->va_mask & VATTR_SIZE) && (va->va_size == 0)) disp = NTCREATEX_DISP_OVERWRITE_IF; else @@ -4398,7 +4398,7 @@ smbfs_map(vnode_t *vp, offset_t off, struct as *as, caddr_t *addrp, * NFS does close-to-open consistency stuff here. * Just get (possibly cached) attributes. */ - va.va_mask = AT_ALL; + va.va_mask = VATTR_ALL; if ((error = smbfsgetattr(vp, &va, cr)) != 0) return (error); @@ -4723,11 +4723,11 @@ smbfs_space(vnode_t *vp, int cmd, struct flock64 *bfp, int flag, * mtime if we truncate the file to its * previous size. */ - va.va_mask = AT_SIZE; + va.va_mask = VATTR_SIZE; error = smbfsgetattr(vp, &va, cr); if (error || va.va_size == bfp->l_start) return (error); - va.va_mask = AT_SIZE; + va.va_mask = VATTR_SIZE; va.va_size = bfp->l_start; error = smbfssetattr(vp, &va, 0, cr); /* SMBFS_VNEVENT... */ diff --git a/usr/src/uts/common/fs/smbsrv/smb_fem.c b/usr/src/uts/common/fs/smbsrv/smb_fem.c index 810722fc5e..47070c8dc1 100644 --- a/usr/src/uts/common/fs/smbsrv/smb_fem.c +++ b/usr/src/uts/common/fs/smbsrv/smb_fem.c @@ -446,7 +446,7 @@ smb_fem_oplock_setattr( { int rc = 0; - if (ct != &smb_ct && (vap->va_mask & AT_SIZE) != 0) + if (ct != &smb_ct && (vap->va_mask & VATTR_SIZE) != 0) rc = smb_fem_oplock_break(arg, ct, SMB_OPLOCK_BREAK_TO_NONE); if (rc == 0) rc = vnext_setattr(arg, vap, flags, cr, ct); diff --git a/usr/src/uts/common/fs/smbsrv/smb_vops.c b/usr/src/uts/common/fs/smbsrv/smb_vops.c index 88c9cb1d25..3baa3d64ec 100644 --- a/usr/src/uts/common/fs/smbsrv/smb_vops.c +++ b/usr/src/uts/common/fs/smbsrv/smb_vops.c @@ -137,21 +137,21 @@ extern sysid_t lm_alloc_sysidt(); #define SMB_AT_MAX 16 static const uint_t smb_attrmap[SMB_AT_MAX] = { 0, - AT_TYPE, - AT_MODE, - AT_UID, - AT_GID, - AT_FSID, - AT_NODEID, - AT_NLINK, - AT_SIZE, - AT_ATIME, - AT_MTIME, - AT_CTIME, - AT_RDEV, - AT_BLKSIZE, - AT_NBLOCKS, - AT_SEQ + VATTR_TYPE, + VATTR_MODE, + VATTR_UID, + VATTR_GID, + VATTR_FSID, + VATTR_NODEID, + VATTR_NLINK, + VATTR_SIZE, + VATTR_ATIME, + VATTR_MTIME, + VATTR_CTIME, + VATTR_RDEV, + VATTR_BLKSIZE, + VATTR_NBLOCKS, + VATTR_SEQ }; static boolean_t smb_vop_initialized = B_FALSE; @@ -341,7 +341,7 @@ smb_vop_getattr(vnode_t *vp, vnode_t *unnamed_vp, smb_attr_t *ret_attr, ret_attr->sa_vattr = tmp_xvattr.xva_vattr; ret_attr->sa_dosattr = 0; - if (tmp_xvattr.xva_vattr.va_mask & AT_XVATTR) { + if (tmp_xvattr.xva_vattr.va_mask & VATTR_XVATTR) { xoap = xva_getxoptattr(&tmp_xvattr); ASSERT(xoap); @@ -406,7 +406,7 @@ smb_vop_getattr(vnode_t *vp, vnode_t *unnamed_vp, smb_attr_t *ret_attr, ret_attr->sa_vattr.va_type = VREG; if (ret_attr->sa_mask & (SMB_AT_SIZE | SMB_AT_NBLOCKS)) { - tmp_attr.sa_vattr.va_mask = AT_SIZE | AT_NBLOCKS; + tmp_attr.sa_vattr.va_mask = VATTR_SIZE | VATTR_NBLOCKS; error = fop_getattr(vp, &tmp_attr.sa_vattr, flags, cr, &smb_ct); @@ -491,7 +491,7 @@ smb_vop_setattr(vnode_t *vp, vnode_t *unnamed_vp, smb_attr_t *attr, return (error); if (at_size) { - attr->sa_vattr.va_mask = AT_SIZE; + attr->sa_vattr.va_mask = VATTR_SIZE; error = fop_setattr(vp, &attr->sa_vattr, flags, zone_kcred(), &smb_ct); } @@ -876,7 +876,7 @@ smb_vop_setup_xvattr(smb_attr_t *smb_attr, xvattr_t *xvattr) /* * Copy caller-specified classic attributes to xvattr. * First save xvattr's mask (set in xva_init()), which - * contains AT_XVATTR. This is |'d in later if needed. + * contains VATTR_XVATTR. This is |'d in later if needed. */ xva_mask = xvattr->xva_vattr.va_mask; @@ -888,13 +888,13 @@ smb_vop_setup_xvattr(smb_attr_t *smb_attr, xvattr_t *xvattr) * Do not set ctime (only the file system can do it) */ - xvattr->xva_vattr.va_mask &= ~AT_CTIME; + xvattr->xva_vattr.va_mask &= ~VATTR_CTIME; if (smb_attr->sa_mask & SMB_AT_DOSATTR) { /* * "|" in the original xva_mask, which contains - * AT_XVATTR + * VATTR_XVATTR */ xvattr->xva_vattr.va_mask |= xva_mask; @@ -935,7 +935,7 @@ smb_vop_setup_xvattr(smb_attr_t *smb_attr, xvattr_t *xvattr) if (smb_attr->sa_mask & SMB_AT_CRTIME) { /* * "|" in the original xva_mask, which contains - * AT_XVATTR + * VATTR_XVATTR */ xvattr->xva_vattr.va_mask |= xva_mask; diff --git a/usr/src/uts/common/fs/zut/zut.c b/usr/src/uts/common/fs/zut/zut.c index 133f8be107..989eeab035 100644 --- a/usr/src/uts/common/fs/zut/zut.c +++ b/usr/src/uts/common/fs/zut/zut.c @@ -144,7 +144,7 @@ zut_readdir(intptr_t arg, cred_t *cr, int iflag, int *rvalp) if (zr->zr_retcode) goto zutr_done; - vattr.va_mask = AT_ALL; + vattr.va_mask = VATTR_ALL; zr->zr_retcode = fop_getattr(fvn, &vattr, 0, cr, NULL); if (zr->zr_retcode) goto zutr_done; @@ -220,7 +220,7 @@ zut_stat64(vnode_t *vp, struct stat64 *sb, uint64_t *xvs, int flag, cred_t *cr) XVA_SET_REQ(&xv, XAT_OFFLINE); XVA_SET_REQ(&xv, XAT_SPARSE); - xv.xva_vattr.va_mask |= AT_STAT | AT_NBLOCKS | AT_BLKSIZE | AT_SIZE; + xv.xva_vattr.va_mask |= VATTR_STAT | VATTR_NBLOCKS | VATTR_BLKSIZE | VATTR_SIZE; if (error = fop_getattr(vp, &xv.xva_vattr, flag, cr, NULL)) return (error); @@ -329,7 +329,7 @@ zut_lookup(intptr_t arg, cred_t *cr, int iflag, int *rvalp) if (zl->zl_retcode) goto zutl_done; - vattr.va_mask = AT_ALL; + vattr.va_mask = VATTR_ALL; zl->zl_retcode = fop_getattr(fvn, &vattr, 0, cr, NULL); if (zl->zl_retcode) goto zutl_done; diff --git a/usr/src/uts/common/io/sysmsg.c b/usr/src/uts/common/io/sysmsg.c index 6962193a30..a44cd102cb 100644 --- a/usr/src/uts/common/io/sysmsg.c +++ b/usr/src/uts/common/io/sysmsg.c @@ -337,7 +337,7 @@ bind_consadm_conf(char *path) if (vn_open(path, UIO_SYSSPACE, FREAD, 0, &vp, 0, 0) != 0) return; - vattr.va_mask = AT_SIZE; + vattr.va_mask = VATTR_SIZE; if ((err = fop_getattr(vp, &vattr, 0, kcred, NULL)) != 0) { cmn_err(CE_WARN, "sysmsg: getattr: '%s': error %d", path, err); diff --git a/usr/src/uts/common/io/vscan/vscan_svc.c b/usr/src/uts/common/io/vscan/vscan_svc.c index b07b6bebc5..5d2890d1aa 100644 --- a/usr/src/uts/common/io/vscan/vscan_svc.c +++ b/usr/src/uts/common/io/vscan/vscan_svc.c @@ -869,7 +869,7 @@ vscan_svc_process_scan_result(int idx) /* if mtime has changed, don't clear the modified attribute */ vp = node->vsn_req->vsr_vp; mtime = &(node->vsn_mtime); - attr.va_mask = AT_MTIME; + attr.va_mask = VATTR_MTIME; if ((fop_getattr(vp, &attr, 0, kcred, NULL) != 0) || (mtime->tv_sec != attr.va_mtime.tv_sec) || (mtime->tv_nsec != attr.va_mtime.tv_nsec)) { @@ -912,7 +912,7 @@ vscan_svc_process_scan_result(int idx) /* * vscan_svc_getattr * - * Get the vscan related system attributes, AT_SIZE & AT_MTIME. + * Get the vscan related system attributes, VATTR_SIZE & VATTR_MTIME. */ static int vscan_svc_getattr(int idx) @@ -929,10 +929,10 @@ vscan_svc_getattr(int idx) return (-1); /* get the attributes */ - xva_init(&xvattr); /* sets AT_XVATTR */ + xva_init(&xvattr); /* sets VATTR_XVATTR */ - xvattr.xva_vattr.va_mask |= AT_SIZE; - xvattr.xva_vattr.va_mask |= AT_MTIME; + xvattr.xva_vattr.va_mask |= VATTR_SIZE; + xvattr.xva_vattr.va_mask |= VATTR_MTIME; XVA_SET_REQ(&xvattr, XAT_AV_MODIFIED); XVA_SET_REQ(&xvattr, XAT_AV_QUARANTINED); XVA_SET_REQ(&xvattr, XAT_AV_SCANSTAMP); @@ -989,7 +989,7 @@ vscan_svc_setattr(int idx, int which) return (-1); /* update the attributes */ - xva_init(&xvattr); /* sets AT_XVATTR */ + xva_init(&xvattr); /* sets VATTR_XVATTR */ if ((xoap = xva_getxoptattr(&xvattr)) == NULL) return (-1); @@ -1012,7 +1012,7 @@ vscan_svc_setattr(int idx, int which) /* if access is denied, set mtime to invalidate client cache */ if (node->vsn_access != VS_ACCESS_ALLOW) { - xvattr.xva_vattr.va_mask |= AT_MTIME; + xvattr.xva_vattr.va_mask |= VATTR_MTIME; gethrestime(&xvattr.xva_vattr.va_mtime); } @@ -1082,7 +1082,7 @@ vscan_svc_exempt_file(vnode_t *vp, boolean_t *allow) ASSERT(vp != NULL); - attr.va_mask = AT_SIZE; + attr.va_mask = VATTR_SIZE; if (fop_getattr(vp, &attr, 0, kcred, NULL) != 0) { *allow = B_FALSE; diff --git a/usr/src/uts/common/klm/nlm_client.c b/usr/src/uts/common/klm/nlm_client.c index 89884875ab..6fd6069a4c 100644 --- a/usr/src/uts/common/klm/nlm_client.c +++ b/usr/src/uts/common/klm/nlm_client.c @@ -534,7 +534,7 @@ nlm_safelock(vnode_t *vp, const struct flock64 *fl, cred_t *cr) if ((rp->r_mapcnt > 0) && (fl->l_start != 0 || fl->l_len != 0)) return (0); - va.va_mask = AT_MODE; + va.va_mask = VATTR_MODE; err = fop_getattr(vp, &va, 0, cr, NULL); if (err != 0) return (0); diff --git a/usr/src/uts/common/nfs/nfs.h b/usr/src/uts/common/nfs/nfs.h index ec1816c448..eff73b748e 100644 --- a/usr/src/uts/common/nfs/nfs.h +++ b/usr/src/uts/common/nfs/nfs.h @@ -2300,8 +2300,8 @@ extern void nfs4_clnt_fini(void); extern bool_t rfs4_check_delegated(int mode, vnode_t *, bool_t trunc); /* * fop_getattr call. If a NFS4 delegation is present on the supplied vnode - * call back to the delegated client to get attributes for AT_MTIME and - * AT_SIZE. Invoke fop_getattr to get all other attributes or all attributes + * call back to the delegated client to get attributes for VATTR_MTIME and + * VATTR_SIZE. Invoke fop_getattr to get all other attributes or all attributes * if no delegation is present. */ extern int rfs4_delegated_getattr(vnode_t *, vattr_t *, int, cred_t *); diff --git a/usr/src/uts/common/nfs/nfs4_attr.h b/usr/src/uts/common/nfs/nfs4_attr.h index 44acf555b4..0d738edbe4 100644 --- a/usr/src/uts/common/nfs/nfs4_attr.h +++ b/usr/src/uts/common/nfs/nfs4_attr.h @@ -151,19 +151,19 @@ extern "C" { * The corresponding AT_MASK */ #define NFS4_NTOV_ATTR_AT_MASK ( \ - AT_TYPE | \ - AT_SIZE | \ - AT_FSID | \ - AT_NODEID | \ - AT_MODE | \ - AT_UID | \ - AT_GID | \ - AT_NLINK | \ - AT_ATIME | \ - AT_MTIME | \ - AT_CTIME | \ - AT_RDEV | \ - AT_NBLOCKS) + VATTR_TYPE | \ + VATTR_SIZE | \ + VATTR_FSID | \ + VATTR_NODEID | \ + VATTR_MODE | \ + VATTR_UID | \ + VATTR_GID | \ + VATTR_NLINK | \ + VATTR_ATIME | \ + VATTR_MTIME | \ + VATTR_CTIME | \ + VATTR_RDEV | \ + VATTR_NBLOCKS) /* * Common bitmap4 of filesystem attributes to be gathered @@ -202,32 +202,32 @@ extern "C" { * The corresponding AT_MASK */ #define NFS4_NTOV_ATTR_CACHE_AT_MASK ( \ - AT_CTIME | \ - AT_MTIME | \ - AT_SIZE) + VATTR_CTIME | \ + VATTR_MTIME | \ + VATTR_SIZE) #define NFS4_VTON_ATTR_MASK ( \ - AT_TYPE | \ - AT_MODE | \ - AT_UID | \ - AT_GID | \ - AT_NODEID | \ - AT_SIZE | \ - AT_NLINK | \ - AT_ATIME | \ - AT_MTIME | \ - AT_CTIME | \ - AT_RDEV | \ - AT_NBLOCKS | \ - AT_FSID) + VATTR_TYPE | \ + VATTR_MODE | \ + VATTR_UID | \ + VATTR_GID | \ + VATTR_NODEID | \ + VATTR_SIZE | \ + VATTR_NLINK | \ + VATTR_ATIME | \ + VATTR_MTIME | \ + VATTR_CTIME | \ + VATTR_RDEV | \ + VATTR_NBLOCKS | \ + VATTR_FSID) #define NFS4_VTON_ATTR_MASK_SET ( \ - AT_MODE | \ - AT_UID | \ - AT_GID | \ - AT_SIZE | \ - AT_ATIME | \ - AT_MTIME) + VATTR_MODE | \ + VATTR_UID | \ + VATTR_GID | \ + VATTR_SIZE | \ + VATTR_ATIME | \ + VATTR_MTIME) /* solaris-supported, non-vattr_t per-vnode scoped attrs */ #define NFS4_VP_ATTR_MASK ( \ -- 2.11.4.GIT