From 9806ce5b8ee8201c7f0ef8b2f333e059ddbc192a Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Sat, 17 Jul 1999 19:59:55 +0000
Subject: [PATCH] Add a field to struct swdevt to avoid a bogus udev2dev()
 call.

---
 sys/sys/conf.h     | 5 +++--
 sys/sys/linedisc.h | 5 +++--
 sys/vm/vm_swap.c   | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index 5596df22d13..cfa460620a4 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)conf.h	8.5 (Berkeley) 1/9/95
- * $Id: conf.h,v 1.64 1999/07/07 03:03:20 green Exp $
+ * $Id: conf.h,v 1.65 1999/07/07 04:06:56 msmith Exp $
  */
 
 #ifndef _SYS_CONF_H_
@@ -155,10 +155,11 @@ void ldisc_deregister __P((int));
  * Swap device table
  */
 struct swdevt {
-	udev_t	sw_dev;
+	udev_t	sw_dev;			/* For quasibogus swapdev reporting */
 	int	sw_flags;
 	int	sw_nblks;
 	struct	vnode *sw_vp;
+	dev_t	sw_device;
 };
 #define	SW_FREED	0x01
 #define	SW_SEQUENTIAL	0x02
diff --git a/sys/sys/linedisc.h b/sys/sys/linedisc.h
index 5596df22d13..cfa460620a4 100644
--- a/sys/sys/linedisc.h
+++ b/sys/sys/linedisc.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)conf.h	8.5 (Berkeley) 1/9/95
- * $Id: conf.h,v 1.64 1999/07/07 03:03:20 green Exp $
+ * $Id: conf.h,v 1.65 1999/07/07 04:06:56 msmith Exp $
  */
 
 #ifndef _SYS_CONF_H_
@@ -155,10 +155,11 @@ void ldisc_deregister __P((int));
  * Swap device table
  */
 struct swdevt {
-	udev_t	sw_dev;
+	udev_t	sw_dev;			/* For quasibogus swapdev reporting */
 	int	sw_flags;
 	int	sw_nblks;
 	struct	vnode *sw_vp;
+	dev_t	sw_device;
 };
 #define	SW_FREED	0x01
 #define	SW_SEQUENTIAL	0x02
diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c
index b9a286f796f..cf28eefcf43 100644
--- a/sys/vm/vm_swap.c
+++ b/sys/vm/vm_swap.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_swap.c	8.5 (Berkeley) 2/17/94
- * $Id: vm_swap.c,v 1.76 1999/07/07 09:12:44 ache Exp $
+ * $Id: vm_swap.c,v 1.77 1999/07/17 18:43:50 phk Exp $
  */
 
 #include "opt_devfs.h"
@@ -156,7 +156,7 @@ swstrategy(bp)
 		biodone(bp);
 		return;
 	}
-	bp->b_dev = udev2dev(sp->sw_dev, 2);
+	bp->b_dev = sp->sw_device;
 	if (sp->sw_vp == NULL) {
 		bp->b_error = ENODEV;
 		bp->b_flags |= B_ERROR;
@@ -315,6 +315,7 @@ swaponvp(p, vp, dev, nblks)
 
 	sp->sw_vp = vp;
 	sp->sw_dev = dev2udev(dev);
+	sp->sw_device = dev;
 	sp->sw_flags |= SW_FREED;
 	sp->sw_nblks = nblks;