summaryrefslogtreecommitdiffstats
path: root/sys/fs/devfs/devfs_vnops.c
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2001-11-03 17:00:02 +0000
committerphk <phk@FreeBSD.org>2001-11-03 17:00:02 +0000
commitb6f787939fa1bb4669fb19f7d732042c2ca2331c (patch)
tree92e145d00ed0a696833f941c2db6d8da9e283ac1 /sys/fs/devfs/devfs_vnops.c
parentb86df2fcac6aaaf1fb58ee297cd18c4a083779d8 (diff)
downloadFreeBSD-src-b6f787939fa1bb4669fb19f7d732042c2ca2331c.zip
FreeBSD-src-b6f787939fa1bb4669fb19f7d732042c2ca2331c.tar.gz
Use vfs_timestamp() instead of getnanotime().
Add magic stuff copied from ufs_setattr(). Instructed by: bde
Diffstat (limited to 'sys/fs/devfs/devfs_vnops.c')
-rw-r--r--sys/fs/devfs/devfs_vnops.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c
index 56e1e3b..45c5479 100644
--- a/sys/fs/devfs/devfs_vnops.c
+++ b/sys/fs/devfs/devfs_vnops.c
@@ -656,11 +656,13 @@ devfs_setattr(ap)
{
struct devfs_dirent *de;
struct vattr *vap;
+ struct vnode *vp;
int c, error;
uid_t uid;
gid_t gid;
vap = ap->a_vap;
+ vp = ap->a_vp;
if ((vap->va_type != VNON) ||
(vap->va_nlink != VNOVAL) ||
(vap->va_fsid != VNOVAL) ||
@@ -673,8 +675,8 @@ devfs_setattr(ap)
return (EINVAL);
}
- de = ap->a_vp->v_data;
- if (ap->a_vp->v_type == VDIR)
+ de = vp->v_data;
+ if (vp->v_type == VDIR)
de = de->de_dir;
error = c = 0;
@@ -695,6 +697,13 @@ devfs_setattr(ap)
de->de_gid = gid;
c = 1;
}
+
+ /* see comment in ufs_vnops::ufs_setattr() */
+ if ((error = VOP_ACCESS(vp, VADMIN, ap->a_cred, ap->a_td)) &&
+ ((vap->va_vaflags & VA_UTIMES_NULL) == 0 ||
+ (error = VOP_ACCESS(vp, VWRITE, ap->a_cred, ap->a_td))))
+ return (error);
+
if (vap->va_mode != (mode_t)VNOVAL) {
if ((ap->a_cred->cr_uid != de->de_uid) &&
(error = suser(ap->a_td->td_proc)))
@@ -718,7 +727,7 @@ devfs_setattr(ap)
}
if (c)
- getnanotime(&de->de_ctime);
+ vfs_timestamp(&de->de_ctime);
return (0);
}
OpenPOWER on IntegriCloud