3 files changed, 8 insertions, 13 deletions

diff --git a/sys/fs/devfs/devfs_devs.c b/sys/fs/devfs/devfs_devs.c
index 4bcfc03c2b34..10be9daf7b4e 100644
--- a/sys/fs/devfs/devfs_devs.c
+++ b/sys/fs/devfs/devfs_devs.c
@@ -31,12 +31,9 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/dirent.h>
 #include <sys/conf.h>
-#include <sys/proc.h>
 #include <sys/vnode.h>
-#include <sys/mount.h>
 #include <sys/malloc.h>
 #include <sys/eventhandler.h>
 #include <sys/ctype.h>
diff --git a/sys/fs/devfs/devfs_vfsops.c b/sys/fs/devfs/devfs_vfsops.c
index 2cd7611d83eb..27b1fd73a850 100644
--- a/sys/fs/devfs/devfs_vfsops.c
+++ b/sys/fs/devfs/devfs_vfsops.c
@@ -37,8 +37,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/dirent.h>
-#include <sys/conf.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c
index fb14abfcbd7b..496eba5fe070 100644
--- a/sys/fs/devfs/devfs_vnops.c
+++ b/sys/fs/devfs/devfs_vnops.c
@@ -38,7 +38,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/vmmeter.h>
 #include <sys/time.h>
 #include <sys/conf.h>
 #include <sys/vnode.h>
@@ -48,7 +47,6 @@
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/dirent.h>
-#include <sys/resource.h>
 #include <sys/eventhandler.h>
 
 #define DEVFS_INTERN
@@ -222,13 +220,15 @@ devfs_access(ap)
 	} */ *ap;
 {
 	struct vnode *vp = ap->a_vp;
-	mode_t amode = ap->a_mode;
-	struct devfs_dirent *de = vp->v_data;
-	mode_t fmode = de->de_mode;
+	struct devfs_dirent *de;
+	struct devfs_dir *dd;
 
-	/* Some files are simply not modifiable. */
-	if ((amode & VWRITE) && (fmode & (S_IWUSR|S_IWGRP|S_IWOTH)) == 0)
-		return (EPERM);
+	if (vp->v_type == VDIR) {
+		dd = vp->v_data;
+		de = TAILQ_FIRST(&dd->dd_list);
+	} else {
+		de = vp->v_data;
+	}
 
 	return (vaccess(vp->v_type, de->de_mode, de->de_uid, de->de_gid,
 	    ap->a_mode, ap->a_cred));