diff options
Diffstat (limited to 'sys/fs/unionfs')
| -rw-r--r-- | sys/fs/unionfs/union_vfsops.c | 4 | ||||
| -rw-r--r-- | sys/fs/unionfs/union_vnops.c | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c index fb700cc..db4d4d3 100644 --- a/sys/fs/unionfs/union_vfsops.c +++ b/sys/fs/unionfs/union_vfsops.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)union_vfsops.c 8.20 (Berkeley) 5/20/95 - * $Id: union_vfsops.c,v 1.29 1998/05/06 05:29:37 msmith Exp $ + * $Id: union_vfsops.c,v 1.30 1998/09/07 13:17:02 bde Exp $ */ /* @@ -325,7 +325,7 @@ union_unmount(mp, mntflags, p) if (mntflags & MNT_FORCE) flags |= FORCECLOSE; - if (error = union_root(mp, &um_rootvp)) + if ((error = union_root(mp, &um_rootvp)) != 0) return (error); /* diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index 87fda6d..ba9b2a3 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)union_vnops.c 8.32 (Berkeley) 6/23/95 - * $Id: union_vnops.c,v 1.58 1998/07/04 20:45:35 julian Exp $ + * $Id: union_vnops.c,v 1.59 1998/12/14 05:00:59 dillon Exp $ */ #include <sys/param.h> @@ -695,8 +695,12 @@ union_access(ap) */ if (ap->a_mode & VWRITE && (ap->a_vp->v_mount->mnt_flag & MNT_RDONLY)) { switch (ap->a_vp->v_type) { - case VREG: case VDIR: case VLNK: + case VREG: + case VDIR: + case VLNK: return (EROFS); + default: + break; } } if ((vp = un->un_uppervp) != NULLVP) { |
