diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2003-05-12 23:39:15 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2003-05-12 23:39:15 +0000 |
| commit | f26b5f512e10d07a73eba57014b8f3f14c8f6a74 (patch) | |
| tree | 4419f58ca060822dcfc188207d4f5cf81bce3519 | |
| parent | 6744300471fa5d2bba164abc274ed399e7cd2db4 (diff) | |
mapdata -> umapdata like it was before
| -rw-r--r-- | sys/miscfs/umapfs/umap.h | 4 | ||||
| -rw-r--r-- | sys/miscfs/umapfs/umap_vfsops.c | 4 | ||||
| -rw-r--r-- | sys/miscfs/umapfs/umap_vnops.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/miscfs/umapfs/umap.h b/sys/miscfs/umapfs/umap.h index 89184907c29..2f78a173a07 100644 --- a/sys/miscfs/umapfs/umap.h +++ b/sys/miscfs/umapfs/umap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: umap.h,v 1.10 2003/05/12 21:02:10 tedu Exp $ */ +/* $OpenBSD: umap.h,v 1.11 2003/05/12 23:39:14 tedu Exp $ */ /* $NetBSD: umap.h,v 1.9 1999/07/08 01:19:06 wrstuden Exp $ */ /* @@ -54,7 +54,7 @@ struct umap_args { #define umap_export la.export int unentries; /* # of entries in user map array */ int gnentries; /* # of entries in group map array */ - u_long (*mapdata)[2]; /* pointer to array of user mappings */ + u_long (*umapdata)[2]; /* pointer to array of user mappings */ u_long (*gmapdata)[2]; /* pointer to array of group mappings */ }; diff --git a/sys/miscfs/umapfs/umap_vfsops.c b/sys/miscfs/umapfs/umap_vfsops.c index 0e2a482d1e1..1b9d9012cd5 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.20 2003/05/12 21:02:10 tedu Exp $ */ +/* $OpenBSD: umap_vfsops.c,v 1.21 2003/05/12 23:39:14 tedu Exp $ */ /* $NetBSD: umap_vfsops.c,v 1.35 2002/09/21 18:09:31 christos Exp $ */ /* @@ -164,7 +164,7 @@ umapfs_mount(mp, path, data, ndp, p) amp->info_unentries = args.unentries; amp->info_gnentries = args.gnentries; - error = copyin(args.mapdata, (caddr_t)amp->info_umapdata, + error = copyin(args.umapdata, (caddr_t)amp->info_umapdata, 2*sizeof(u_long)*args.unentries); if (error) { vput(lowerrootvp); diff --git a/sys/miscfs/umapfs/umap_vnops.c b/sys/miscfs/umapfs/umap_vnops.c index ef8585c0654..9a735051ae4 100644 --- a/sys/miscfs/umapfs/umap_vnops.c +++ b/sys/miscfs/umapfs/umap_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umap_vnops.c,v 1.16 2003/05/12 21:02:10 tedu Exp $ */ +/* $OpenBSD: umap_vnops.c,v 1.17 2003/05/12 23:39:14 tedu Exp $ */ /* $NetBSD: umap_vnops.c,v 1.22 2002/01/04 07:19:34 chs Exp $ */ /* @@ -416,7 +416,7 @@ umap_getattr(v) uid_t uid; gid_t gid; int error, tmpid, unentries, gnentries, flags; - u_long (*mapdata)[2]; + u_long (*umapdata)[2]; u_long (*gmapdata)[2]; struct vnode **vp1p; const struct vnodeop_desc *descp = ap->a_desc; @@ -448,14 +448,14 @@ umap_getattr(v) vp1p = VOPARG_OFFSETTO(struct vnode**, descp->vdesc_vp_offsets[0], ap); unentries = MOUNTTOUMAPMOUNT((*vp1p)->v_mount)->info_unentries; - mapdata = (MOUNTTOUMAPMOUNT((*vp1p)->v_mount)->info_umapdata); + umapdata = (MOUNTTOUMAPMOUNT((*vp1p)->v_mount)->info_umapdata); gnentries = MOUNTTOUMAPMOUNT((*vp1p)->v_mount)->info_gnentries; gmapdata = (MOUNTTOUMAPMOUNT((*vp1p)->v_mount)->info_gmapdata); /* Reverse map the uid for the vnode. Since it's a reverse map, we can't use umap_mapids() to do it. */ - tmpid = umap_reverse_findid(uid, mapdata, unentries); + tmpid = umap_reverse_findid(uid, umapdata, unentries); if (tmpid != -1) { ap->a_vap->va_uid = (uid_t) tmpid; |