diff options
author | rgrimes <rgrimes@FreeBSD.org> | 1995-05-30 08:16:23 +0000 |
---|---|---|
committer | rgrimes <rgrimes@FreeBSD.org> | 1995-05-30 08:16:23 +0000 |
commit | c86f0c7a71e7ade3e38b325c186a9cf374e0411e (patch) | |
tree | 176f04f674860c7cfae9ac5d2ff4d4e1d73cb2b7 /sys/miscfs/umapfs | |
parent | 423ba8f9bc23d93bfc244aca9b12563b1c9de90d (diff) | |
download | FreeBSD-src-c86f0c7a71e7ade3e38b325c186a9cf374e0411e.zip FreeBSD-src-c86f0c7a71e7ade3e38b325c186a9cf374e0411e.tar.gz |
Remove trailing whitespace.
Diffstat (limited to 'sys/miscfs/umapfs')
-rw-r--r-- | sys/miscfs/umapfs/umap.h | 6 | ||||
-rw-r--r-- | sys/miscfs/umapfs/umap_subr.c | 4 | ||||
-rw-r--r-- | sys/miscfs/umapfs/umap_vfsops.c | 18 | ||||
-rw-r--r-- | sys/miscfs/umapfs/umap_vnops.c | 44 |
4 files changed, 36 insertions, 36 deletions
diff --git a/sys/miscfs/umapfs/umap.h b/sys/miscfs/umapfs/umap.h index 5903d30..5be2e5e 100644 --- a/sys/miscfs/umapfs/umap.h +++ b/sys/miscfs/umapfs/umap.h @@ -35,7 +35,7 @@ * * @(#)umap.h 8.3 (Berkeley) 1/21/94 * - * $Id$ + * $Id: umap.h,v 1.2 1994/08/02 07:45:33 davidg Exp $ */ #define MAPFILEENTRIES 64 @@ -56,9 +56,9 @@ struct umap_mount { struct vnode *umapm_rootvp; /* Reference to root umap_node */ int info_nentries; /* number of uid mappings */ int info_gnentries; /* number of gid mappings */ - u_long info_mapdata[MAPFILEENTRIES][2]; /* mapping data for + u_long info_mapdata[MAPFILEENTRIES][2]; /* mapping data for user mapping in ficus */ - u_long info_gmapdata[GMAPFILEENTRIES][2]; /*mapping data for + u_long info_gmapdata[GMAPFILEENTRIES][2]; /*mapping data for group mapping in ficus */ }; diff --git a/sys/miscfs/umapfs/umap_subr.c b/sys/miscfs/umapfs/umap_subr.c index 4b2aad4b..792f4a8 100644 --- a/sys/miscfs/umapfs/umap_subr.c +++ b/sys/miscfs/umapfs/umap_subr.c @@ -35,7 +35,7 @@ * * @(#)umap_subr.c 8.6 (Berkeley) 1/26/94 * - * $Id: umap_subr.c,v 1.2 1994/05/25 09:09:07 rgrimes Exp $ + * $Id: umap_subr.c,v 1.3 1994/10/10 07:55:43 phk Exp $ */ #include <sys/param.h> @@ -387,7 +387,7 @@ umap_mapids(v_mount, credp) credp->cr_gid = NULLGROUP; #endif - /* Now we must map each of the set of groups in the cr_groups + /* Now we must map each of the set of groups in the cr_groups structure. */ i = 0; diff --git a/sys/miscfs/umapfs/umap_vfsops.c b/sys/miscfs/umapfs/umap_vfsops.c index a98ae18..64f05bb 100644 --- a/sys/miscfs/umapfs/umap_vfsops.c +++ b/sys/miscfs/umapfs/umap_vfsops.c @@ -35,7 +35,7 @@ * * @(#)umap_vfsops.c 8.3 (Berkeley) 1/21/94 * - * $Id: umap_vfsops.c,v 1.6 1995/03/16 18:13:55 bde Exp $ + * $Id: umap_vfsops.c,v 1.7 1995/03/16 20:23:43 wollman Exp $ */ /* @@ -127,12 +127,12 @@ umapfs_mount(mp, path, data, ndp, p) */ amp->umapm_vfs = lowerrootvp->v_mount; - /* + /* * Now copy in the number of entries and maps for umap mapping. */ amp->info_nentries = args.nentries; amp->info_gnentries = args.gnentries; - error = copyin(args.mapdata, (caddr_t)amp->info_mapdata, + error = copyin(args.mapdata, (caddr_t)amp->info_mapdata, 2*sizeof(u_long)*args.nentries); if (error) return (error); @@ -144,7 +144,7 @@ umapfs_mount(mp, path, data, ndp, p) amp->info_mapdata[i][1]); #endif - error = copyin(args.gmapdata, (caddr_t)amp->info_gmapdata, + error = copyin(args.gmapdata, (caddr_t)amp->info_gmapdata, 2*sizeof(u_long)*args.nentries); if (error) return (error); @@ -152,7 +152,7 @@ umapfs_mount(mp, path, data, ndp, p) #ifdef UMAP_DIAGNOSTIC printf("umap_mount:gnentries %d\n",args.gnentries); for (i = 0; i < args.gnentries; i++) - printf(" group %d maps to %d\n", + printf(" group %d maps to %d\n", amp->info_gmapdata[i][0], amp->info_gmapdata[i][1]); #endif @@ -190,7 +190,7 @@ umapfs_mount(mp, path, data, ndp, p) (void) copyinstr(path, mp->mnt_stat.f_mntonname, MNAMELEN - 1, &size); bzero(mp->mnt_stat.f_mntonname + size, MNAMELEN - size); - (void) copyinstr(args.target, mp->mnt_stat.f_mntfromname, MNAMELEN - 1, + (void) copyinstr(args.target, mp->mnt_stat.f_mntfromname, MNAMELEN - 1, &size); bzero(mp->mnt_stat.f_mntfromname + size, MNAMELEN - size); #ifdef UMAPFS_DIAGNOSTIC @@ -245,7 +245,7 @@ umapfs_unmount(mp, mntflags, p) * moment, but who knows... */ #ifdef notyet - mntflushbuf(mp, 0); + mntflushbuf(mp, 0); if (mntinvalbuf(mp, 1)) return (EBUSY); #endif @@ -257,7 +257,7 @@ umapfs_unmount(mp, mntflags, p) #ifdef UMAPFS_DIAGNOSTIC vprint("alias root of lower", umapm_rootvp); -#endif +#endif /* * Release reference on underlying root vnode */ @@ -368,7 +368,7 @@ umapfs_vget(mp, ino, vpp) ino_t ino; struct vnode **vpp; { - + return (VFS_VGET(MOUNTTOUMAPMOUNT(mp)->umapm_vfs, ino, vpp)); } diff --git a/sys/miscfs/umapfs/umap_vnops.c b/sys/miscfs/umapfs/umap_vnops.c index 14d3fcc..a82d1c6 100644 --- a/sys/miscfs/umapfs/umap_vnops.c +++ b/sys/miscfs/umapfs/umap_vnops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)umap_vnops.c 8.3 (Berkeley) 1/5/94 - * $Id: umap_vnops.c,v 1.7 1994/10/10 07:55:44 phk Exp $ + * $Id: umap_vnops.c,v 1.8 1995/03/19 14:28:55 davidg Exp $ */ /* @@ -59,7 +59,7 @@ int umap_bug_bypass = 0; /* for debugging: enables bypass printf'ing */ /* * This is the 10-Apr-92 bypass routine. * See null_vnops.c:null_bypass for more details. - */ + */ int umap_bypass(ap) struct vop_generic_args /* { @@ -101,7 +101,7 @@ umap_bypass(ap) for (i = 0; i < VDESC_MAX_VPS; reles >>= 1, i++) { if (descp->vdesc_vp_offsets[i] == VDESC_NO_OFFSET) break; /* bail out at end of list */ - vps_p[i] = this_vp_p = + vps_p[i] = this_vp_p = VOPARG_OFFSETTO(struct vnode**, descp->vdesc_vp_offsets[i], ap); if (i == 0) { @@ -122,7 +122,7 @@ umap_bypass(ap) if (reles & 1) VREF(*this_vp_p); } - + } /* @@ -131,7 +131,7 @@ umap_bypass(ap) if (descp->vdesc_cred_offset != VDESC_NO_OFFSET) { - credpp = VOPARG_OFFSETTO(struct ucred**, + credpp = VOPARG_OFFSETTO(struct ucred**, descp->vdesc_cred_offset, ap); /* Save old values */ @@ -141,7 +141,7 @@ umap_bypass(ap) credp = *credpp; if (umap_bug_bypass && credp->cr_uid != 0) - printf("umap_bypass: user was %ld, group %ld\n", + printf("umap_bypass: user was %ld, group %ld\n", credp->cr_uid, credp->cr_gid); /* Map all ids in the credential structure. */ @@ -149,17 +149,17 @@ umap_bypass(ap) umap_mapids(vp1->v_mount, credp); if (umap_bug_bypass && credp->cr_uid != 0) - printf("umap_bypass: user now %ld, group %ld\n", + printf("umap_bypass: user now %ld, group %ld\n", credp->cr_uid, credp->cr_gid); } /* BSD often keeps a credential in the componentname structure - * for speed. If there is one, it better get mapped, too. + * for speed. If there is one, it better get mapped, too. */ if (descp->vdesc_componentname_offset != VDESC_NO_OFFSET) { - compnamepp = VOPARG_OFFSETTO(struct componentname**, + compnamepp = VOPARG_OFFSETTO(struct componentname**, descp->vdesc_componentname_offset, ap); compcredp = (*compnamepp)->cn_cred; @@ -167,7 +167,7 @@ umap_bypass(ap) compcredp = (*compnamepp)->cn_cred = crdup(savecompcredp); if (umap_bug_bypass && compcredp->cr_uid != 0) - printf("umap_bypass: component credit user was %ld, group %ld\n", + printf("umap_bypass: component credit user was %ld, group %ld\n", compcredp->cr_uid, compcredp->cr_gid); /* Map all ids in the credential structure. */ @@ -175,7 +175,7 @@ umap_bypass(ap) umap_mapids(vp1->v_mount, compcredp); if (umap_bug_bypass && compcredp->cr_uid != 0) - printf("umap_bypass: component credit user now %ld, group %ld\n", + printf("umap_bypass: component credit user now %ld, group %ld\n", compcredp->cr_uid, compcredp->cr_gid); } @@ -217,7 +217,7 @@ umap_bypass(ap) }; out: - /* + /* * Free duplicate cred structure and restore old one. */ if (descp->vdesc_cred_offset != VDESC_NO_OFFSET) { @@ -228,19 +228,19 @@ umap_bypass(ap) crfree(credp); (*credpp) = savecredp; if (umap_bug_bypass && credpp && (*credpp)->cr_uid != 0) - printf("umap_bypass: returning-user now %ld\n\n", + printf("umap_bypass: returning-user now %ld\n\n", (*credpp)->cr_uid); } if (descp->vdesc_componentname_offset != VDESC_NO_OFFSET) { if (umap_bug_bypass && compcredp && compcredp->cr_uid != 0) - printf("umap_bypass: returning-component-user was %ld\n", + printf("umap_bypass: returning-component-user was %ld\n", compcredp->cr_uid); crfree(compcredp); (*compnamepp)->cn_cred = savecompcredp; if (umap_bug_bypass && credpp && (*credpp)->cr_uid != 0) - printf("umap_bypass: returning-component-user now %ld\n", + printf("umap_bypass: returning-component-user now %ld\n", compcredp->cr_uid); } @@ -288,7 +288,7 @@ umap_getattr(ap) uid = ap->a_vap->va_uid; gid = ap->a_vap->va_gid; if (umap_bug_bypass) - printf("umap_getattr: mapped uid = %d, mapped gid = %d\n", uid, + printf("umap_getattr: mapped uid = %d, mapped gid = %d\n", uid, gid); vp1p = VOPARG_OFFSETTO(struct vnode**, descp->vdesc_vp_offsets[0], ap); @@ -307,7 +307,7 @@ umap_getattr(ap) ap->a_vap->va_uid = (uid_t) tmpid; if (umap_bug_bypass) printf("umap_getattr: original uid = %d\n", uid); - } else + } else ap->a_vap->va_uid = (uid_t) NOBODY; /* Reverse map the gid for the vnode. */ @@ -321,7 +321,7 @@ umap_getattr(ap) printf("umap_getattr: original gid = %d\n", gid); } else ap->a_vap->va_gid = (gid_t) NULLGROUP; - + return (0); } @@ -350,7 +350,7 @@ umap_reclaim(ap) struct vnode *vp = ap->a_vp; struct umap_node *xp = VTOUMAP(vp); struct vnode *lowervp = xp->umap_lowervp; - + /* After this assignment, this node will not be re-used. */ xp->umap_lowervp = NULL; remque(xp); @@ -442,7 +442,7 @@ umap_rename(ap) compcredp = compnamep->cn_cred = crdup(savecompcredp); if (umap_bug_bypass && compcredp->cr_uid != 0) - printf("umap_rename: rename component credit user was %ld, group %ld\n", + printf("umap_rename: rename component credit user was %ld, group %ld\n", compcredp->cr_uid, compcredp->cr_gid); /* Map all ids in the credential structure. */ @@ -450,11 +450,11 @@ umap_rename(ap) umap_mapids(vp->v_mount, compcredp); if (umap_bug_bypass && compcredp->cr_uid != 0) - printf("umap_rename: rename component credit user now %ld, group %ld\n", + printf("umap_rename: rename component credit user now %ld, group %ld\n", compcredp->cr_uid, compcredp->cr_gid); error = umap_bypass(ap); - + /* Restore the additional mapped componentname cred structure. */ crfree(compcredp); |