Reinstate the previous fix for the broken export of a dev_t in sw_dev, convert
back to a dev_t when the value is actually used.
This commit is contained in:
parent
175fc55c0d
commit
b60bdf74d6
@ -36,7 +36,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)conf.h 8.5 (Berkeley) 1/9/95
|
||||
* $Id: conf.h,v 1.62 1999/07/04 19:48:35 phk Exp $
|
||||
* $Id: conf.h,v 1.64 1999/07/07 03:03:20 green Exp $
|
||||
*/
|
||||
|
||||
#ifndef _SYS_CONF_H_
|
||||
@ -155,7 +155,7 @@ void ldisc_deregister __P((int));
|
||||
* Swap device table
|
||||
*/
|
||||
struct swdevt {
|
||||
dev_t sw_dev;
|
||||
udev_t sw_dev;
|
||||
int sw_flags;
|
||||
int sw_nblks;
|
||||
struct vnode *sw_vp;
|
||||
|
@ -36,7 +36,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)conf.h 8.5 (Berkeley) 1/9/95
|
||||
* $Id: conf.h,v 1.62 1999/07/04 19:48:35 phk Exp $
|
||||
* $Id: conf.h,v 1.64 1999/07/07 03:03:20 green Exp $
|
||||
*/
|
||||
|
||||
#ifndef _SYS_CONF_H_
|
||||
@ -155,7 +155,7 @@ void ldisc_deregister __P((int));
|
||||
* Swap device table
|
||||
*/
|
||||
struct swdevt {
|
||||
dev_t sw_dev;
|
||||
udev_t sw_dev;
|
||||
int sw_flags;
|
||||
int sw_nblks;
|
||||
struct vnode *sw_vp;
|
||||
|
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)vm_swap.c 8.5 (Berkeley) 2/17/94
|
||||
* $Id: vm_swap.c,v 1.72 1999/06/26 02:46:49 mckusick Exp $
|
||||
* $Id: vm_swap.c,v 1.74 1999/07/07 03:03:59 green Exp $
|
||||
*/
|
||||
|
||||
#include "opt_devfs.h"
|
||||
@ -156,7 +156,7 @@ swstrategy(bp)
|
||||
biodone(bp);
|
||||
return;
|
||||
}
|
||||
bp->b_dev = sp->sw_dev;
|
||||
bp->b_dev = udev2dev(sp->sw_dev);
|
||||
if (sp->sw_vp == NULL) {
|
||||
bp->b_error = ENODEV;
|
||||
bp->b_flags |= B_ERROR;
|
||||
@ -314,7 +314,7 @@ swaponvp(p, vp, dev, nblks)
|
||||
nblks = dbtoc(nblks);
|
||||
|
||||
sp->sw_vp = vp;
|
||||
sp->sw_dev = dev;
|
||||
sp->sw_dev = dev2udev(dev);
|
||||
sp->sw_flags |= SW_FREED;
|
||||
sp->sw_nblks = nblks;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user