diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 1996-03-19 21:10:57 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 1996-03-19 21:10:57 +0000 |
| commit | 169c29d1b708c51bbae3f546e0adfe0d433b5b7b (patch) | |
| tree | 15b32c155eb85259ca3be610962de5f8aa24b91c /sys/miscfs/umapfs | |
| parent | 7aa5f12551d2fef2475152a3a5c9b9961e14b83a (diff) | |
Merging w/ NetBSD 021796.
speaker upgraded to the current.
some changes to the VM stuff (ie kern_thread.c added and so).
Diffstat (limited to 'sys/miscfs/umapfs')
| -rw-r--r-- | sys/miscfs/umapfs/umap_subr.c | 5 | ||||
| -rw-r--r-- | sys/miscfs/umapfs/umap_vfsops.c | 9 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/miscfs/umapfs/umap_subr.c b/sys/miscfs/umapfs/umap_subr.c index e082e792278..45f555eda0a 100644 --- a/sys/miscfs/umapfs/umap_subr.c +++ b/sys/miscfs/umapfs/umap_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umap_subr.c,v 1.4 1996/03/02 00:08:06 niklas Exp $ */ +/* $OpenBSD: umap_subr.c,v 1.5 1996/03/19 21:10:42 mickey Exp $ */ /* $NetBSD: umap_subr.c,v 1.7 1996/02/09 22:41:02 christos Exp $ */ /* @@ -401,6 +401,9 @@ umap_mapids(v_mount, credp) gid_t gid; u_long (*usermap)[2], (*groupmap)[2]; + if (credp == NOCRED) + return; + unentries = MOUNTTOUMAPMOUNT(v_mount)->info_nentries; usermap = MOUNTTOUMAPMOUNT(v_mount)->info_mapdata; gnentries = MOUNTTOUMAPMOUNT(v_mount)->info_gnentries; diff --git a/sys/miscfs/umapfs/umap_vfsops.c b/sys/miscfs/umapfs/umap_vfsops.c index 604347af58e..e12c7fbc296 100644 --- a/sys/miscfs/umapfs/umap_vfsops.c +++ b/sys/miscfs/umapfs/umap_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umap_vfsops.c,v 1.3 1996/02/29 13:08:06 niklas Exp $ */ +/* $OpenBSD: umap_vfsops.c,v 1.4 1996/03/19 21:10:43 mickey Exp $ */ /* $NetBSD: umap_vfsops.c,v 1.9 1996/02/09 22:41:05 christos Exp $ */ /* @@ -320,8 +320,7 @@ umapfs_quotactl(mp, cmd, uid, arg, p) caddr_t arg; struct proc *p; { - - return (EOPNOTSUPP); + return VFS_QUOTACTL(MOUNTTOUMAPMOUNT(mp)->umapm_vfs, cmd, uid, arg, p); } int @@ -372,7 +371,6 @@ umapfs_sync(mp, waitfor, cred, p) struct ucred *cred; struct proc *p; { - /* * XXX - Assumes no data cached at umap layer. */ @@ -385,8 +383,7 @@ umapfs_vget(mp, ino, vpp) ino_t ino; struct vnode **vpp; { - - return (EOPNOTSUPP); + return VFS_VGET(MOUNTTOUMAPMOUNT(mp)->umapm_vfs, ino, vpp); } int |