aboutsummaryrefslogtreecommitdiff
path: root/sys/msdosfs
diff options
context:
space:
mode:
authorMatthew Dillon <dillon@FreeBSD.org>1999-01-27 22:42:27 +0000
committerMatthew Dillon <dillon@FreeBSD.org>1999-01-27 22:42:27 +0000
commit831a80b0d5d50e416fe5e4b237d3a9fd4eea00b8 (patch)
treef992000fa6fa60b61396de4df4bebeada04cda79 /sys/msdosfs
parentbe317f36a9bf314d51d60720160fc0677390c728 (diff)
Notes
Diffstat (limited to 'sys/msdosfs')
-rw-r--r--sys/msdosfs/msdosfs_vfsops.c6
-rw-r--r--sys/msdosfs/msdosfs_vnops.c7
2 files changed, 9 insertions, 4 deletions
diff --git a/sys/msdosfs/msdosfs_vfsops.c b/sys/msdosfs/msdosfs_vfsops.c
index b3a63b55d613..bca552c80742 100644
--- a/sys/msdosfs/msdosfs_vfsops.c
+++ b/sys/msdosfs/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $Id: msdosfs_vfsops.c,v 1.38 1998/10/31 15:31:24 peter Exp $ */
+/* $Id: msdosfs_vfsops.c,v 1.39 1998/12/07 21:58:35 archie Exp $ */
/* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */
/*-
@@ -911,9 +911,9 @@ loop:
nvp = vp->v_mntvnodes.le_next;
dep = VTODE(vp);
if (vp->v_type == VNON ||
- (dep->de_flag &
+ ((dep->de_flag &
(DE_ACCESS | DE_CREATE | DE_UPDATE | DE_MODIFIED)) == 0 &&
- (TAILQ_EMPTY(&vp->v_dirtyblkhd) || waitfor == MNT_LAZY)) {
+ (TAILQ_EMPTY(&vp->v_dirtyblkhd) || waitfor == MNT_LAZY))) {
simple_unlock(&vp->v_interlock);
continue;
}
diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c
index aad4e6ba9f1e..36aa91d73af7 100644
--- a/sys/msdosfs/msdosfs_vnops.c
+++ b/sys/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/* $Id: msdosfs_vnops.c,v 1.79 1998/11/29 22:38:57 dt Exp $ */
+/* $Id: msdosfs_vnops.c,v 1.80 1998/12/07 21:58:35 archie Exp $ */
/* $NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $ */
/*-
@@ -278,6 +278,8 @@ msdosfs_access(ap)
if (vp->v_mount->mnt_flag & MNT_RDONLY)
return (EROFS);
break;
+ default:
+ break;
}
}
@@ -485,11 +487,14 @@ msdosfs_setattr(ap)
switch (vp->v_type) {
case VDIR:
return (EISDIR);
+ /* NOT REACHED */
case VLNK:
case VREG:
if (vp->v_mount->mnt_flag & MNT_RDONLY)
return (EROFS);
break;
+ default:
+ break;
}
error = detrunc(dep, vap->va_size, 0, cred, ap->a_p);
if (error)