Module Name: src
Committed By: christos
Date: Thu Sep 26 20:57:19 UTC 2019
Modified Files:
src/sys/fs/ptyfs: ptyfs_vnops.c
src/sys/sys: vnode.h
Log Message:
provide VNOVALSIZE and VNOVALFLAGS to avoid casting in source.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/fs/ptyfs/ptyfs_vnops.c
cvs rdiff -u -r1.281 -r1.282 src/sys/sys/vnode.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/ptyfs/ptyfs_vnops.c
diff -u src/sys/fs/ptyfs/ptyfs_vnops.c:1.56 src/sys/fs/ptyfs/ptyfs_vnops.c:1.57
--- src/sys/fs/ptyfs/ptyfs_vnops.c:1.56 Thu Sep 26 14:35:48 2019
+++ src/sys/fs/ptyfs/ptyfs_vnops.c Thu Sep 26 16:57:19 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ptyfs_vnops.c,v 1.56 2019/09/26 18:35:48 christos Exp $ */
+/* $NetBSD: ptyfs_vnops.c,v 1.57 2019/09/26 20:57:19 christos Exp $ */
/*
* Copyright (c) 1993, 1995
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ptyfs_vnops.c,v 1.56 2019/09/26 18:35:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ptyfs_vnops.c,v 1.57 2019/09/26 20:57:19 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -405,7 +405,7 @@ ptyfs_setattr(void *v)
kauth_action_t action = KAUTH_VNODE_WRITE_FLAGS;
bool changing_sysflags = false;
- if (vap->va_size != (u_quad_t)VNOVAL) {
+ if (vap->va_size != VNOVALSIZE) {
switch (ptyfs->ptyfs_type) {
case PTYFSroot:
return EISDIR;
@@ -417,7 +417,7 @@ ptyfs_setattr(void *v)
}
}
- if (vap->va_flags != (u_quad_t)VNOVAL) {
+ if (vap->va_flags != VNOVALFLAGS) {
if (vp->v_mount->mnt_flag & MNT_RDONLY)
return EROFS;
Index: src/sys/sys/vnode.h
diff -u src/sys/sys/vnode.h:1.281 src/sys/sys/vnode.h:1.282
--- src/sys/sys/vnode.h:1.281 Tue Jan 1 05:06:54 2019
+++ src/sys/sys/vnode.h Thu Sep 26 16:57:19 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vnode.h,v 1.281 2019/01/01 10:06:54 hannken Exp $ */
+/* $NetBSD: vnode.h,v 1.282 2019/09/26 20:57:19 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -277,6 +277,8 @@ struct vattr {
* Token indicating no attribute value yet assigned.
*/
#define VNOVAL (-1)
+#define VNOVALSIZE ((u_quad_t)-1)
+#define VNOVALFLAGS ((u_long)-1)
/*
* Convert between vnode types and inode formats (since POSIX.1
