Remove register keyword.

Sponsored by:	DARPA & NAI Labs.
Submitted by:	mckusick

13 files changed, 127 insertions, 127 deletions

diff --git a/sys/gnu/ext2fs/ext2_bmap.c b/sys/gnu/ext2fs/ext2_bmap.c
index fa8ea01..ed0afc9 100644
--- a/sys/gnu/ext2fs/ext2_bmap.c
+++ b/sys/gnu/ext2fs/ext2_bmap.c
@@ -111,7 +111,7 @@ ufs_bmaparray(vp, bn, bnp, runp, runb)
 	int *runp;
 	int *runb;
 {
-	register struct inode *ip;
+	struct inode *ip;
 	struct buf *bp;
 	struct ufsmount *ump;
 	struct mount *mp;
diff --git a/sys/gnu/fs/ext2fs/ext2_bmap.c b/sys/gnu/fs/ext2fs/ext2_bmap.c
index fa8ea01..ed0afc9 100644
--- a/sys/gnu/fs/ext2fs/ext2_bmap.c
+++ b/sys/gnu/fs/ext2fs/ext2_bmap.c
@@ -111,7 +111,7 @@ ufs_bmaparray(vp, bn, bnp, runp, runb)
 	int *runp;
 	int *runb;
 {
-	register struct inode *ip;
+	struct inode *ip;
 	struct buf *bp;
 	struct ufsmount *ump;
 	struct mount *mp;
diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c
index 3793f05..1034dbde 100644
--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -97,13 +97,13 @@ static ufs_daddr_t ffs_mapsearch(struct fs *, struct cg *, ufs_daddr_t, int);
  */
 int
 ffs_alloc(ip, lbn, bpref, size, cred, bnp)
-	register struct inode *ip;
+	struct inode *ip;
 	ufs_daddr_t lbn, bpref;
 	int size;
 	struct ucred *cred;
 	ufs_daddr_t *bnp;
 {
-	register struct fs *fs;
+	struct fs *fs;
 	ufs_daddr_t bno;
 	int cg, reclaimed;
 #ifdef QUOTA
@@ -175,7 +175,7 @@ nospace:
  */
 int
 ffs_realloccg(ip, lbprev, bpref, osize, nsize, cred, bpp)
-	register struct inode *ip;
+	struct inode *ip;
 	ufs_daddr_t lbprev;
 	ufs_daddr_t bpref;
 	int osize, nsize;
@@ -593,9 +593,9 @@ ffs_valloc(pvp, mode, cred, vpp)
 	struct ucred *cred;
 	struct vnode **vpp;
 {
-	register struct inode *pip;
-	register struct fs *fs;
-	register struct inode *ip;
+	struct inode *pip;
+	struct fs *fs;
+	struct inode *ip;
 	ino_t ino, ipref;
 	int cg, error;
 
@@ -673,7 +673,7 @@ static ino_t
 ffs_dirpref(pip)
 	struct inode *pip;
 {
-	register struct fs *fs;
+	struct fs *fs;
 	int cg, prefcg, dirsize, cgsize;
 	int avgifree, avgbfree, avgndir, curdirsize;
 	int minifree, minbfree, maxndir;
@@ -798,8 +798,8 @@ ffs_blkpref(ip, lbn, indx, bap)
 	int indx;
 	ufs_daddr_t *bap;
 {
-	register struct fs *fs;
-	register int cg;
+	struct fs *fs;
+	int cg;
 	int avgbfree, startcg;
 	ufs_daddr_t nextblk;
 
@@ -871,7 +871,7 @@ ffs_hashalloc(ip, cg, pref, size, allocator)
 	int size;	/* size for data blocks, mode for inodes */
 	allocfcn_t *allocator;
 {
-	register struct fs *fs;
+	struct fs *fs;
 	long result;	/* XXX why not same type as we return? */
 	int i, icg = cg;
 
@@ -927,8 +927,8 @@ ffs_fragextend(ip, cg, bprev, osize, nsize)
 	long bprev;
 	int osize, nsize;
 {
-	register struct fs *fs;
-	register struct cg *cgp;
+	struct fs *fs;
+	struct cg *cgp;
 	struct buf *bp;
 	long bno;
 	int frags, bbase;
@@ -1004,10 +1004,10 @@ ffs_alloccg(ip, cg, bpref, size)
 	ufs_daddr_t bpref;
 	int size;
 {
-	register struct fs *fs;
-	register struct cg *cgp;
+	struct fs *fs;
+	struct cg *cgp;
 	struct buf *bp;
-	register int i;
+	int i;
 	ufs_daddr_t bno, blkno;
 	int allocsiz, error, frags;
 	u_int8_t *blksfree;
@@ -1115,7 +1115,7 @@ ffs_alloccgblk(ip, bp, bpref)
 	ufs_daddr_t bno, blkno;
 	int cylno, pos, delta;
 	short *cylbp;
-	register int i;
+	int i;
 	u_int8_t *blksfree;
 
 	fs = ip->i_fs;
@@ -1231,8 +1231,8 @@ ffs_clusteralloc(ip, cg, bpref, len)
 	ufs_daddr_t bpref;
 	int len;
 {
-	register struct fs *fs;
-	register struct cg *cgp;
+	struct fs *fs;
+	struct cg *cgp;
 	struct buf *bp;
 	int i, got, run, bno, bit, map;
 	u_char *mapp;
@@ -1347,8 +1347,8 @@ ffs_nodealloccg(ip, cg, ipref, mode)
 	ufs_daddr_t ipref;
 	int mode;
 {
-	register struct fs *fs;
-	register struct cg *cgp;
+	struct fs *fs;
+	struct cg *cgp;
 	struct buf *bp;
 	u_int8_t *inosused;
 	int error, start, len, loc, map, i;
@@ -1698,8 +1698,8 @@ ffs_freefile(fs, devvp, ino, mode)
  */
 static ufs_daddr_t
 ffs_mapsearch(fs, cgp, bpref, allocsiz)
-	register struct fs *fs;
-	register struct cg *cgp;
+	struct fs *fs;
+	struct cg *cgp;
 	ufs_daddr_t bpref;
 	int allocsiz;
 {
diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c
index 75d30d9..215cc85 100644
--- a/sys/ufs/ffs/ffs_inode.c
+++ b/sys/ufs/ffs/ffs_inode.c
@@ -77,7 +77,7 @@ ffs_update(vp, waitfor)
 	struct vnode *vp;
 	int waitfor;
 {
-	register struct fs *fs;
+	struct fs *fs;
 	struct buf *bp;
 	struct inode *ip;
 	int error;
@@ -137,16 +137,16 @@ ffs_truncate(vp, length, flags, cred, td)
 	struct ucred *cred;
 	struct thread *td;
 {
-	register struct vnode *ovp = vp;
+	struct vnode *ovp = vp;
 	ufs_daddr_t lastblock;
-	register struct inode *oip;
+	struct inode *oip;
 	ufs_daddr_t bn, lbn, lastiblock[NIADDR], indir_lbn[NIADDR];
 	ufs_daddr_t oldblks[NDADDR + NIADDR], newblks[NDADDR + NIADDR];
-	register struct fs *fs;
+	struct fs *fs;
 	struct buf *bp;
 	int offset, size, level;
 	long count, nblocks, blocksreleased = 0;
-	register int i;
+	int i;
 	int aflags, error, allerror;
 	off_t osize;
 
@@ -349,7 +349,7 @@ ffs_truncate(vp, length, flags, cred, td)
 	 * All whole direct blocks or frags.
 	 */
 	for (i = NDADDR - 1; i > lastblock; i--) {
-		register long bsize;
+		long bsize;
 
 		bn = oip->i_db[i];
 		if (bn == 0)
@@ -430,16 +430,16 @@ done:
  */
 static int
 ffs_indirtrunc(ip, lbn, dbn, lastbn, level, countp)
-	register struct inode *ip;
+	struct inode *ip;
 	ufs_daddr_t lbn, lastbn;
 	ufs_daddr_t dbn;
 	int level;
 	long *countp;
 {
-	register int i;
+	int i;
 	struct buf *bp;
-	register struct fs *fs = ip->i_fs;
-	register ufs_daddr_t *bap;
+	struct fs *fs = ip->i_fs;
+	ufs_daddr_t *bap;
 	struct vnode *vp;
 	ufs_daddr_t *copy = NULL, nb, nlbn, last;
 	long blkcount, factor;
diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c
index a32a92a..f484090 100644
--- a/sys/ufs/ffs/ffs_subr.c
+++ b/sys/ufs/ffs/ffs_subr.c
@@ -70,7 +70,7 @@ ffs_blkatoff(vp, offset, res, bpp)
 	struct buf **bpp;
 {
 	struct inode *ip;
-	register struct fs *fs;
+	struct fs *fs;
 	struct buf *bp;
 	ufs_daddr_t lbn;
 	int bsize, error;
@@ -105,8 +105,8 @@ ffs_fragacct(fs, fragmap, fraglist, cnt)
 	int cnt;
 {
 	int inblk;
-	register int field, subfield;
-	register int siz, pos;
+	int field, subfield;
+	int siz, pos;
 
 	inblk = (int)(fragtbl[fs->fs_frag][fragmap]) << 1;
 	fragmap <<= 1;
@@ -134,8 +134,8 @@ ffs_checkoverlap(bp, ip)
 	struct buf *bp;
 	struct inode *ip;
 {
-	register struct buf *ebp, *ep;
-	register ufs_daddr_t start, last;
+	struct buf *ebp, *ep;
+	ufs_daddr_t start, last;
 	struct vnode *vp;
 
 	ebp = &buf[nbuf];
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index e459543..eab47f9 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -143,7 +143,7 @@ ffs_mount(mp, path, data, ndp, td)
 	struct vnode	*devvp;
 	struct ufs_args args;
 	struct ufsmount *ump = 0;
-	register struct fs *fs;
+	struct fs *fs;
 	int error, flags;
 	mode_t accessmode;
 
@@ -374,11 +374,11 @@ ffs_mount(mp, path, data, ndp, td)
  */
 int
 ffs_reload(mp, cred, td)
-	register struct mount *mp;
+	struct mount *mp;
 	struct ucred *cred;
 	struct thread *td;
 {
-	register struct vnode *vp, *nvp, *devvp;
+	struct vnode *vp, *nvp, *devvp;
 	struct inode *ip;
 	void *space;
 	struct buf *bp;
@@ -537,14 +537,14 @@ SYSCTL_INT(_debug, OID_AUTO, bigcgs, CTLFLAG_RW, &bigcgs, 0, "");
  */
 int
 ffs_mountfs(devvp, mp, td, malloctype)
-	register struct vnode *devvp;
+	struct vnode *devvp;
 	struct mount *mp;
 	struct thread *td;
 	struct malloc_type *malloctype;
 {
-	register struct ufsmount *ump;
+	struct ufsmount *ump;
 	struct buf *bp;
-	register struct fs *fs;
+	struct fs *fs;
 	dev_t dev;
 	void *space;
 	int error, i, blks, size, ronly;
@@ -850,8 +850,8 @@ ffs_unmount(mp, mntflags, td)
 	int mntflags;
 	struct thread *td;
 {
-	register struct ufsmount *ump = VFSTOUFS(mp);
-	register struct fs *fs;
+	struct ufsmount *ump = VFSTOUFS(mp);
+	struct fs *fs;
 	int error, flags;
 
 	flags = 0;
@@ -919,11 +919,11 @@ ffs_unmount(mp, mntflags, td)
  */
 int
 ffs_flushfiles(mp, flags, td)
-	register struct mount *mp;
+	struct mount *mp;
 	int flags;
 	struct thread *td;
 {
-	register struct ufsmount *ump;
+	struct ufsmount *ump;
 	int error;
 
 	ump = VFSTOUFS(mp);
@@ -973,11 +973,11 @@ ffs_flushfiles(mp, flags, td)
 int
 ffs_statfs(mp, sbp, td)
 	struct mount *mp;
-	register struct statfs *sbp;
+	struct statfs *sbp;
 	struct thread *td;
 {
-	register struct ufsmount *ump;
-	register struct fs *fs;
+	struct ufsmount *ump;
+	struct fs *fs;
 
 	ump = VFSTOUFS(mp);
 	fs = ump->um_fs;
@@ -1320,11 +1320,11 @@ restart:
  */
 int
 ffs_fhtovp(mp, fhp, vpp)
-	register struct mount *mp;
+	struct mount *mp;
 	struct fid *fhp;
 	struct vnode **vpp;
 {
-	register struct ufid *ufhp;
+	struct ufid *ufhp;
 	struct fs *fs;
 
 	ufhp = (struct ufid *)fhp;
@@ -1344,8 +1344,8 @@ ffs_vptofh(vp, fhp)
 	struct vnode *vp;
 	struct fid *fhp;
 {
-	register struct inode *ip;
-	register struct ufid *ufhp;
+	struct inode *ip;
+	struct ufid *ufhp;
 
 	ip = VTOI(vp);
 	ufhp = (struct ufid *)fhp;
@@ -1376,8 +1376,8 @@ ffs_sbupdate(mp, waitfor)
 	struct ufsmount *mp;
 	int waitfor;
 {
-	register struct fs *dfs, *fs = mp->um_fs;
-	register struct buf *bp;
+	struct fs *dfs, *fs = mp->um_fs;
+	struct buf *bp;
 	int blks;
 	void *space;
 	int i, size, error, allerror = 0;
diff --git a/sys/ufs/ifs/ifs_vnops.c b/sys/ufs/ifs/ifs_vnops.c
index cb12f69..fa2b7f0 100644
--- a/sys/ufs/ifs/ifs_vnops.c
+++ b/sys/ufs/ifs/ifs_vnops.c
@@ -166,9 +166,9 @@ ifs_getattr(ap)
 		struct proc *a_p;
 	} */ *ap;
 {
-	register struct vnode *vp = ap->a_vp;
-	register struct inode *ip = VTOI(vp);
-	register struct vattr *vap = ap->a_vap;
+	struct vnode *vp = ap->a_vp;
+	struct inode *ip = VTOI(vp);
+	struct vattr *vap = ap->a_vap;
 
 	ufs_itimes(vp);
 	/*
@@ -233,7 +233,7 @@ ifs_makeinode(mode, dvp, vpp, cnp)
 	struct vnode **vpp;
 	struct componentname *cnp;
 {
-	register struct inode *ip, *pdir;
+	struct inode *ip, *pdir;
 	struct vnode *tvp;
 	int error;
 
diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c
index fa8ea01..ed0afc9 100644
--- a/sys/ufs/ufs/ufs_bmap.c
+++ b/sys/ufs/ufs/ufs_bmap.c
@@ -111,7 +111,7 @@ ufs_bmaparray(vp, bn, bnp, runp, runb)
 	int *runp;
 	int *runb;
 {
-	register struct inode *ip;
+	struct inode *ip;
 	struct buf *bp;
 	struct ufsmount *ump;
 	struct mount *mp;
diff --git a/sys/ufs/ufs/ufs_inode.c b/sys/ufs/ufs/ufs_inode.c
index 87070cf..55f9128 100644
--- a/sys/ufs/ufs/ufs_inode.c
+++ b/sys/ufs/ufs/ufs_inode.c
@@ -139,8 +139,8 @@ ufs_reclaim(ap)
 		struct thread *a_td;
 	} */ *ap;
 {
-	register struct inode *ip;
-	register struct vnode *vp = ap->a_vp;
+	struct inode *ip;
+	struct vnode *vp = ap->a_vp;
 #ifdef QUOTA
 	int i;
 #endif
diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c
index a668a18..a5d219f 100644
--- a/sys/ufs/ufs/ufs_lookup.c
+++ b/sys/ufs/ufs/ufs_lookup.c
@@ -131,8 +131,8 @@ ufs_lookup(ap)
 		struct componentname *a_cnp;
 	} */ *ap;
 {
-	register struct vnode *vdp;	/* vnode for directory being searched */
-	register struct inode *dp;	/* inode for directory being searched */
+	struct vnode *vdp;	/* vnode for directory being searched */
+	struct inode *dp;	/* inode for directory being searched */
 	struct buf *bp;			/* a buffer of directory entries */
 	struct direct *ep;		/* the current directory entry */
 	int entryoffsetinblock;		/* offset of ep in bp's buffer */
@@ -641,10 +641,10 @@ ufs_dirbad(ip, offset, how)
 int
 ufs_dirbadentry(dp, ep, entryoffsetinblock)
 	struct vnode *dp;
-	register struct direct *ep;
+	struct direct *ep;
 	int entryoffsetinblock;
 {
-	register int i;
+	int i;
 	int namlen;
 
 #	if (BYTE_ORDER == LITTLE_ENDIAN)
@@ -1134,13 +1134,13 @@ ufs_dirrewrite(dp, oip, newinum, newtype, isrmdir)
  */
 int
 ufs_dirempty(ip, parentino, cred)
-	register struct inode *ip;
+	struct inode *ip;
 	ino_t parentino;
 	struct ucred *cred;
 {
-	register off_t off;
+	off_t off;
 	struct dirtemplate dbuf;
-	register struct direct *dp = (struct direct *)&dbuf;
+	struct direct *dp = (struct direct *)&dbuf;
 	int error, count, namlen;
 #define	MINDIRSIZ (sizeof (struct dirtemplate) / 2)
 
diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c
index 0d893b4..4e156fc 100644
--- a/sys/ufs/ufs/ufs_quota.c
+++ b/sys/ufs/ufs/ufs_quota.c
@@ -84,7 +84,7 @@ static void chkdquot(struct inode *);
  */
 int
 getinoquota(ip)
-	register struct inode *ip;
+	struct inode *ip;
 {
 	struct ufsmount *ump;
 	struct vnode *vp = ITOV(ip);
@@ -117,13 +117,13 @@ getinoquota(ip)
  */
 int
 chkdq(ip, change, cred, flags)
-	register struct inode *ip;
+	struct inode *ip;
 	long change;
 	struct ucred *cred;
 	int flags;
 {
-	register struct dquot *dq;
-	register int i;
+	struct dquot *dq;
+	int i;
 	int ncurblocks, error;
 
 #ifdef DIAGNOSTIC
@@ -188,7 +188,7 @@ chkdqchg(ip, change, cred, type)
 	struct ucred *cred;
 	int type;
 {
-	register struct dquot *dq = ip->i_dquot[type];
+	struct dquot *dq = ip->i_dquot[type];
 	long ncurblocks = dq->dq_curblocks + change;
 
 	/*
@@ -238,13 +238,13 @@ chkdqchg(ip, change, cred, type)
  */
 int
 chkiq(ip, change, cred, flags)
-	register struct inode *ip;
+	struct inode *ip;
 	long change;
 	struct ucred *cred;
 	int flags;
 {
-	register struct dquot *dq;
-	register int i;
+	struct dquot *dq;
+	int i;
 	int ncurinodes, error;
 
 #ifdef DIAGNOSTIC
@@ -309,7 +309,7 @@ chkiqchg(ip, change, cred, type)
 	struct ucred *cred;
 	int type;
 {
-	register struct dquot *dq = ip->i_dquot[type];
+	struct dquot *dq = ip->i_dquot[type];
 	long ncurinodes = dq->dq_curinodes + change;
 
 	/*
@@ -361,10 +361,10 @@ chkiqchg(ip, change, cred, type)
  */
 static void
 chkdquot(ip)
-	register struct inode *ip;
+	struct inode *ip;
 {
 	struct ufsmount *ump = VFSTOUFS(ITOV(ip)->v_mount);
-	register int i;
+	int i;
 
 	for (i = 0; i < MAXQUOTAS; i++) {
 		if (ump->um_quotas[i] == NULLVP ||
@@ -389,7 +389,7 @@ int
 quotaon(td, mp, type, fname)
 	struct thread *td;
 	struct mount *mp;
-	register int type;
+	int type;
 	caddr_t fname;
 {
 	struct ufsmount *ump = VFSTOUFS(mp);
@@ -477,7 +477,7 @@ int
 quotaoff(td, mp, type)
 	struct thread *td;
 	struct mount *mp;
-	register int type;
+	int type;
 {
 	struct vnode *vp;
 	struct vnode *qvp, *nextvp;
@@ -567,7 +567,7 @@ setquota(mp, id, type, addr)
 	int type;
 	caddr_t addr;
 {
-	register struct dquot *dq;
+	struct dquot *dq;
 	struct dquot *ndq;
 	struct ufsmount *ump = VFSTOUFS(mp);
 	struct dqblk newlim;
@@ -628,7 +628,7 @@ setuse(mp, id, type, addr)
 	int type;
 	caddr_t addr;
 {
-	register struct dquot *dq;
+	struct dquot *dq;
 	struct ufsmount *ump = VFSTOUFS(mp);
 	struct dquot *ndq;
 	struct dqblk usage;
@@ -760,8 +760,8 @@ static int
 dqget(vp, id, ump, type, dqp)
 	struct vnode *vp;
 	u_long id;
-	register struct ufsmount *ump;
-	register int type;
+	struct ufsmount *ump;
+	int type;
 	struct dquot **dqp;
 {
 	struct thread *td = curthread;		/* XXX */
@@ -891,7 +891,7 @@ dqref(dq)
 void
 dqrele(vp, dq)
 	struct vnode *vp;
-	register struct dquot *dq;
+	struct dquot *dq;
 {
 
 	if (dq == NODQUOT)
@@ -965,9 +965,9 @@ dqsync(vp, dq)
  */
 static void
 dqflush(vp)
-	register struct vnode *vp;
+	struct vnode *vp;
 {
-	register struct dquot *dq, *nextdq;
+	struct dquot *dq, *nextdq;
 	struct dqhash *dqh;
 
 	/*
diff --git a/sys/ufs/ufs/ufs_readwrite.c b/sys/ufs/ufs/ufs_readwrite.c
index c9a0e6f..1831a42 100644
--- a/sys/ufs/ufs/ufs_readwrite.c
+++ b/sys/ufs/ufs/ufs_readwrite.c
@@ -63,10 +63,10 @@ READ(ap)
 		struct ucred *a_cred;
 	} */ *ap;
 {
-	register struct vnode *vp;
-	register struct inode *ip;
-	register struct uio *uio;
-	register FS *fs;
+	struct vnode *vp;
+	struct inode *ip;
+	struct uio *uio;
+	FS *fs;
 	struct buf *bp;
 	ufs_daddr_t lbn, nextlbn;
 	off_t bytesinfile;
@@ -388,10 +388,10 @@ WRITE(ap)
 		struct ucred *a_cred;
 	} */ *ap;
 {
-	register struct vnode *vp;
-	register struct uio *uio;
-	register struct inode *ip;
-	register FS *fs;
+	struct vnode *vp;
+	struct uio *uio;
+	struct inode *ip;
+	FS *fs;
 	struct buf *bp;
 	struct thread *td;
 	ufs_daddr_t lbn;
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index 4f3bc67..5eba4bf 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -407,9 +407,9 @@ ufs_getattr(ap)
 		struct thread *a_td;
 	} */ *ap;
 {
-	register struct vnode *vp = ap->a_vp;
-	register struct inode *ip = VTOI(vp);
-	register struct vattr *vap = ap->a_vap;
+	struct vnode *vp = ap->a_vp;
+	struct inode *ip = VTOI(vp);
+	struct vattr *vap = ap->a_vap;
 
 	ufs_itimes(vp);
 	/*
@@ -596,12 +596,12 @@ ufs_setattr(ap)
  */
 static int
 ufs_chmod(vp, mode, cred, td)
-	register struct vnode *vp;
-	register int mode;
-	register struct ucred *cred;
+	struct vnode *vp;
+	int mode;
+	struct ucred *cred;
 	struct thread *td;
 {
-	register struct inode *ip = VTOI(vp);
+	struct inode *ip = VTOI(vp);
 	int error;
 
 	/*
@@ -633,18 +633,18 @@ ufs_chmod(vp, mode, cred, td)
  */
 static int
 ufs_chown(vp, uid, gid, cred, td)
-	register struct vnode *vp;
+	struct vnode *vp;
 	uid_t uid;
 	gid_t gid;
 	struct ucred *cred;
 	struct thread *td;
 {
-	register struct inode *ip = VTOI(vp);
+	struct inode *ip = VTOI(vp);
 	uid_t ouid;
 	gid_t ogid;
 	int error = 0;
 #ifdef QUOTA
-	register int i;
+	int i;
 	long change;
 #endif
 
@@ -922,7 +922,7 @@ ufs_rename(ap)
 	} */ *ap;
 {
 	struct vnode *tvp = ap->a_tvp;
-	register struct vnode *tdvp = ap->a_tdvp;
+	struct vnode *tdvp = ap->a_tdvp;
 	struct vnode *fvp = ap->a_fvp;
 	struct vnode *fdvp = ap->a_fdvp;
 	struct componentname *tcnp = ap->a_tcnp;
@@ -1346,10 +1346,10 @@ ufs_mkdir(ap)
 		struct vattr *a_vap;
 	} */ *ap;
 {
-	register struct vnode *dvp = ap->a_dvp;
-	register struct vattr *vap = ap->a_vap;
-	register struct componentname *cnp = ap->a_cnp;
-	register struct inode *ip, *dp;
+	struct vnode *dvp = ap->a_dvp;
+	struct vattr *vap = ap->a_vap;
+	struct componentname *cnp = ap->a_cnp;
+	struct inode *ip, *dp;
 	struct vnode *tvp;
 	struct buf *bp;
 	struct dirtemplate dirtemplate, *dtp;
@@ -1733,8 +1733,8 @@ ufs_symlink(ap)
 		char *a_target;
 	} */ *ap;
 {
-	register struct vnode *vp, **vpp = ap->a_vpp;
-	register struct inode *ip;
+	struct vnode *vp, **vpp = ap->a_vpp;
+	struct inode *ip;
 	int len, error;
 
 	error = ufs_makeinode(IFLNK | ap->a_vap->va_mode, ap->a_dvp,
@@ -1778,7 +1778,7 @@ ufs_readdir(ap)
 		u_long **a_cookies;
 	} */ *ap;
 {
-	register struct uio *uio = ap->a_uio;
+	struct uio *uio = ap->a_uio;
 	int error;
 	size_t count, lost;
 	off_t off;
@@ -1885,8 +1885,8 @@ ufs_readlink(ap)
 		struct ucred *a_cred;
 	} */ *ap;
 {
-	register struct vnode *vp = ap->a_vp;
-	register struct inode *ip = VTOI(vp);
+	struct vnode *vp = ap->a_vp;
+	struct inode *ip = VTOI(vp);
 	int isize;
 
 	isize = ip->i_size;
@@ -1912,9 +1912,9 @@ ufs_strategy(ap)
 		struct buf *a_bp;
 	} */ *ap;
 {
-	register struct buf *bp = ap->a_bp;
-	register struct vnode *vp = ap->a_vp;
-	register struct inode *ip;
+	struct buf *bp = ap->a_bp;
+	struct vnode *vp = ap->a_vp;
+	struct inode *ip;
 	daddr_t blkno;
 	int error;
 
@@ -1952,8 +1952,8 @@ ufs_print(ap)
 		struct vnode *a_vp;
 	} */ *ap;
 {
-	register struct vnode *vp = ap->a_vp;
-	register struct inode *ip = VTOI(vp);
+	struct vnode *vp = ap->a_vp;
+	struct inode *ip = VTOI(vp);
 
 	printf("tag VT_UFS, ino %lu, on dev %s (%d, %d)",
 	    (u_long)ip->i_number, devtoname(ip->i_dev), major(ip->i_dev),
@@ -2183,7 +2183,7 @@ ufs_advlock(ap)
 		int  a_flags;
 	} */ *ap;
 {
-	register struct inode *ip = VTOI(ap->a_vp);
+	struct inode *ip = VTOI(ap->a_vp);
 
 	return (lf_advlock(ap, &(ip->i_lockf), ip->i_size));
 }
@@ -2242,7 +2242,7 @@ ufs_makeinode(mode, dvp, vpp, cnp)
 	struct vnode **vpp;
 	struct componentname *cnp;
 {
-	register struct inode *ip, *pdir;
+	struct inode *ip, *pdir;
 	struct direct newdir;
 	struct vnode *tvp;
 #ifdef UFS_ACL