From 43fc727edba13bf8cf7515a1707a959ca55fc015 Mon Sep 17 00:00:00 2001
From: Kirk McKusick <mckusick@ucbvax.Berkeley.EDU>
Date: Sat, 25 Nov 1989 23:24:37 -0800
Subject: [PATCH] checkalias now sets rdev

SCCS-vsn: sys/ufs/mfs/mfs_vfsops.c 7.8
SCCS-vsn: sys/ufs/ffs/ffs_inode.c 7.22
SCCS-vsn: sys/ufs/ffs/ufs_inode.c 7.22
SCCS-vsn: sys/ufs/lfs/lfs_inode.c 7.22
SCCS-vsn: sys/ufs/ufs/ufs_inode.c 7.22
SCCS-vsn: sys/nfs/nfs_subs.c 7.14
---
 usr/src/sys/nfs/nfs_subs.c       | 5 ++---
 usr/src/sys/ufs/ffs/ffs_inode.c  | 5 ++---
 usr/src/sys/ufs/ffs/ufs_inode.c  | 5 ++---
 usr/src/sys/ufs/lfs/lfs_inode.c  | 5 ++---
 usr/src/sys/ufs/mfs/mfs_vfsops.c | 5 ++---
 usr/src/sys/ufs/ufs/ufs_inode.c  | 5 ++---
 6 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/usr/src/sys/nfs/nfs_subs.c b/usr/src/sys/nfs/nfs_subs.c
index 55683c000b..2700f026fc 100644
--- a/usr/src/sys/nfs/nfs_subs.c
+++ b/usr/src/sys/nfs/nfs_subs.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- *	@(#)nfs_subs.c	7.13 (Berkeley) %G%
+ *	@(#)nfs_subs.c	7.14 (Berkeley) %G%
  */
 
 /*
@@ -623,9 +623,8 @@ nfs_loadattrcache(vpp, mdp, dposp, vaper)
 	if (vp->v_type == VNON) {
 		vp->v_type = type;
 		if (vp->v_type == VCHR || vp->v_type == VBLK) {
-			vp->v_rdev = rdev;
 			vp->v_op = &spec_nfsv2nodeops;
-			if (nvp = checkalias(vp, vp->v_mount)) {
+			if (nvp = checkalias(vp, rdev, vp->v_mount)) {
 				/*
 				 * Reinitialize aliased node.
 				 */
diff --git a/usr/src/sys/ufs/ffs/ffs_inode.c b/usr/src/sys/ufs/ffs/ffs_inode.c
index 578d6caf89..6de24b0b4c 100644
--- a/usr/src/sys/ufs/ffs/ffs_inode.c
+++ b/usr/src/sys/ufs/ffs/ffs_inode.c
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- *	@(#)ffs_inode.c	7.21 (Berkeley) %G%
+ *	@(#)ffs_inode.c	7.22 (Berkeley) %G%
  */
 
 #include "param.h"
@@ -157,9 +157,8 @@ loop:
 	vp = ITOV(ip);
 	vp->v_type = IFTOVT(ip->i_mode);
 	if (vp->v_type == VCHR || vp->v_type == VBLK) {
-		vp->v_rdev = ip->i_rdev;
 		vp->v_op = &spec_inodeops;
-		if (nvp = checkalias(vp, mntp)) {
+		if (nvp = checkalias(vp, ip->i_rdev, mntp)) {
 			/*
 			 * Reinitialize aliased inode.
 			 */
diff --git a/usr/src/sys/ufs/ffs/ufs_inode.c b/usr/src/sys/ufs/ffs/ufs_inode.c
index 6410321206..00ad946ac7 100644
--- a/usr/src/sys/ufs/ffs/ufs_inode.c
+++ b/usr/src/sys/ufs/ffs/ufs_inode.c
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- *	@(#)ufs_inode.c	7.21 (Berkeley) %G%
+ *	@(#)ufs_inode.c	7.22 (Berkeley) %G%
  */
 
 #include "param.h"
@@ -157,9 +157,8 @@ loop:
 	vp = ITOV(ip);
 	vp->v_type = IFTOVT(ip->i_mode);
 	if (vp->v_type == VCHR || vp->v_type == VBLK) {
-		vp->v_rdev = ip->i_rdev;
 		vp->v_op = &spec_inodeops;
-		if (nvp = checkalias(vp, mntp)) {
+		if (nvp = checkalias(vp, ip->i_rdev, mntp)) {
 			/*
 			 * Reinitialize aliased inode.
 			 */
diff --git a/usr/src/sys/ufs/lfs/lfs_inode.c b/usr/src/sys/ufs/lfs/lfs_inode.c
index fea481f361..6b2920177a 100644
--- a/usr/src/sys/ufs/lfs/lfs_inode.c
+++ b/usr/src/sys/ufs/lfs/lfs_inode.c
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- *	@(#)lfs_inode.c	7.21 (Berkeley) %G%
+ *	@(#)lfs_inode.c	7.22 (Berkeley) %G%
  */
 
 #include "param.h"
@@ -157,9 +157,8 @@ loop:
 	vp = ITOV(ip);
 	vp->v_type = IFTOVT(ip->i_mode);
 	if (vp->v_type == VCHR || vp->v_type == VBLK) {
-		vp->v_rdev = ip->i_rdev;
 		vp->v_op = &spec_inodeops;
-		if (nvp = checkalias(vp, mntp)) {
+		if (nvp = checkalias(vp, ip->i_rdev, mntp)) {
 			/*
 			 * Reinitialize aliased inode.
 			 */
diff --git a/usr/src/sys/ufs/mfs/mfs_vfsops.c b/usr/src/sys/ufs/mfs/mfs_vfsops.c
index 6a1c1d24df..2867057a65 100644
--- a/usr/src/sys/ufs/mfs/mfs_vfsops.c
+++ b/usr/src/sys/ufs/mfs/mfs_vfsops.c
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- *	@(#)mfs_vfsops.c	7.7 (Berkeley) %G%
+ *	@(#)mfs_vfsops.c	7.8 (Berkeley) %G%
  */
 
 #include "param.h"
@@ -90,8 +90,7 @@ mfs_mount(mp, path, data, ndp)
 	if (error)
 		return (error);
 	devvp->v_type = VBLK;
-	devvp->v_rdev = makedev(255, mfs_minor++);
-	if (checkalias(devvp, (struct mount *)0) != NULL)
+	if (checkalias(devvp, makedev(255, mfs_minor++), (struct mount *)0))
 		panic("mfs_mount: dup dev");
 	mfsp = VTOMFS(devvp);
 	mfsp->mfs_baseoff = args.base;
diff --git a/usr/src/sys/ufs/ufs/ufs_inode.c b/usr/src/sys/ufs/ufs/ufs_inode.c
index 6410321206..00ad946ac7 100644
--- a/usr/src/sys/ufs/ufs/ufs_inode.c
+++ b/usr/src/sys/ufs/ufs/ufs_inode.c
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- *	@(#)ufs_inode.c	7.21 (Berkeley) %G%
+ *	@(#)ufs_inode.c	7.22 (Berkeley) %G%
  */
 
 #include "param.h"
@@ -157,9 +157,8 @@ loop:
 	vp = ITOV(ip);
 	vp->v_type = IFTOVT(ip->i_mode);
 	if (vp->v_type == VCHR || vp->v_type == VBLK) {
-		vp->v_rdev = ip->i_rdev;
 		vp->v_op = &spec_inodeops;
-		if (nvp = checkalias(vp, mntp)) {
+		if (nvp = checkalias(vp, ip->i_rdev, mntp)) {
 			/*
 			 * Reinitialize aliased inode.
 			 */
-- 
2.20.1