summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2008-09-20 19:46:45 +0000
committerkib <kib@FreeBSD.org>2008-09-20 19:46:45 +0000
commit81d455e702a0846e60a6a9b8419b26740c510752 (patch)
treee507302b4dc7a5cad58e30c582aa41fa9949dc2f
parentc6232cabbebca4c41ec2707ec6848c87507d2929 (diff)
downloadFreeBSD-src-81d455e702a0846e60a6a9b8419b26740c510752.zip
FreeBSD-src-81d455e702a0846e60a6a9b8419b26740c510752.tar.gz
Initialize va_flags and va_filerev properly in VOP_GETATTR(). Don't
initialize va_vaflags and va_spare because they are not part of the VOP_GETATTR() API. Also don't initialize birthtime to ctime or zero. Submitted by: Jaakko Heinonen <jh saunalahti fi> Reviewed by: bde Discussed on: freebsd-fs MFC after: 1 month
-rw-r--r--sys/fs/tmpfs/tmpfs_vnops.c4
-rw-r--r--sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c6
-rw-r--r--sys/kern/uipc_mqueue.c1
-rw-r--r--sys/ufs/ufs/ufs_vnops.c2
4 files changed, 1 insertions, 12 deletions
diff --git a/sys/fs/tmpfs/tmpfs_vnops.c b/sys/fs/tmpfs/tmpfs_vnops.c
index a7eadad..3eb44de 100644
--- a/sys/fs/tmpfs/tmpfs_vnops.c
+++ b/sys/fs/tmpfs/tmpfs_vnops.c
@@ -366,9 +366,7 @@ tmpfs_getattr(struct vop_getattr_args *v)
vap->va_rdev = (vp->v_type == VBLK || vp->v_type == VCHR) ?
node->tn_rdev : VNOVAL;
vap->va_bytes = round_page(node->tn_size);
- vap->va_filerev = VNOVAL;
- vap->va_vaflags = 0;
- vap->va_spare = VNOVAL; /* XXX */
+ vap->va_filerev = 0;
return 0;
}
diff --git a/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c b/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c
index f09e9ce..0ef2e91 100644
--- a/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c
+++ b/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c
@@ -273,15 +273,9 @@ _xfs_getattr(
/*
* Fields with no direct equivalent in XFS
- * leave initialized by VATTR_NULL
*/
-#if 0
vap->va_filerev = 0;
- vap->va_birthtime = va.va_ctime;
- vap->va_vaflags = 0;
vap->va_flags = 0;
- vap->va_spare = 0;
-#endif
return (0);
}
diff --git a/sys/kern/uipc_mqueue.c b/sys/kern/uipc_mqueue.c
index 3b73f40..fc8a20f 100644
--- a/sys/kern/uipc_mqueue.c
+++ b/sys/kern/uipc_mqueue.c
@@ -1184,7 +1184,6 @@ mqfs_getattr(struct vop_getattr_args *ap)
vap->va_rdev = 0;
vap->va_bytes = 0;
vap->va_filerev = 0;
- vap->va_vaflags = 0;
return (error);
}
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index 904f553..12fd13b 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -433,8 +433,6 @@ ufs_getattr(ap)
vap->va_mtime.tv_nsec = ip->i_din1->di_mtimensec;
vap->va_ctime.tv_sec = ip->i_din1->di_ctime;
vap->va_ctime.tv_nsec = ip->i_din1->di_ctimensec;
- vap->va_birthtime.tv_sec = 0;
- vap->va_birthtime.tv_nsec = 0;
vap->va_bytes = dbtob((u_quad_t)ip->i_din1->di_blocks);
} else {
vap->va_rdev = ip->i_din2->di_rdev;
OpenPOWER on IntegriCloud