diff options
Diffstat (limited to 'sys/miscfs/union')
| -rw-r--r-- | sys/miscfs/union/union_subr.c | 6 | ||||
| -rw-r--r-- | sys/miscfs/union/union_vfsops.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/miscfs/union/union_subr.c b/sys/miscfs/union/union_subr.c index 02f7a1068e9b..cbbd17111bbc 100644 --- a/sys/miscfs/union/union_subr.c +++ b/sys/miscfs/union/union_subr.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)union_subr.c 8.4 (Berkeley) 2/17/94 - * $Id: union_subr.c,v 1.4 1994/10/06 21:06:48 davidg Exp $ + * $Id: union_subr.c,v 1.5 1994/10/10 07:55:46 phk Exp $ */ #include <sys/param.h> @@ -130,7 +130,7 @@ union_updatevp(un, uppervp, lowervp) LIST_REMOVE(un, un_cache); union_list_unlock(ohash); - } else { + } else { while (union_list_lock(nhash)) continue; } @@ -372,7 +372,7 @@ loop: /* * otherwise lock the vp list while we call getnewvnode * since that can block. - */ + */ hash = UNION_HASH(uppervp, lowervp); if (union_list_lock(hash)) diff --git a/sys/miscfs/union/union_vfsops.c b/sys/miscfs/union/union_vfsops.c index c9e2c60874f4..670c7ce98d90 100644 --- a/sys/miscfs/union/union_vfsops.c +++ b/sys/miscfs/union/union_vfsops.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)union_vfsops.c 8.7 (Berkeley) 3/5/94 - * $Id: union_vfsops.c,v 1.8 1995/03/16 18:14:02 bde Exp $ + * $Id: union_vfsops.c,v 1.9 1995/03/16 20:23:44 wollman Exp $ */ /* @@ -118,7 +118,7 @@ union_mount(mp, path, data, ndp, p) error = VOP_GETATTR(mp->mnt_vnodecovered, &va, cred, p); if (error) goto bad; - if ((va.va_uid != cred->cr_uid) && + if ((va.va_uid != cred->cr_uid) && (cred->cr_uid != 0)) { error = EACCES; goto bad; @@ -163,7 +163,7 @@ union_mount(mp, path, data, ndp, p) error = EINVAL; goto bad; } - + um = (struct union_mount *) malloc(sizeof(struct union_mount), M_UFSMNT, M_WAITOK); /* XXX */ @@ -338,7 +338,7 @@ union_unmount(mp, mntflags, p) #ifdef UNION_DIAGNOSTIC vprint("alias root of lower", um_rootvp); -#endif +#endif /* * Discard references to upper and lower target vnodes. */ @@ -517,7 +517,7 @@ union_vget(mp, ino, vpp) ino_t ino; struct vnode **vpp; { - + return (EOPNOTSUPP); } |