d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make a dev2budev() function, and use it. This refixes pstat (working, broken,

Browse Source 
working, broken, working) and savecore (working, working, broken, working,
working).

Sorta Reviewed by:	phk
This commit is contained in:
Brian Feldman 1999-07-20 21:29:13 +00:00
parent d1b67c3735
commit fb30b5bdaf
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/kern/kern_conf.c
View File

@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: kern_conf.c,v 1.50 1999/07/19 09:37:59 phk Exp $
* $Id: kern_conf.c,v 1.51 1999/07/20 09:47:41 phk Exp $
*/
#include <sys/param.h>
@ -242,6 +242,15 @@ dev2udev(dev_t x)
return (x->si_udev);
}
udev_t
dev2budev(dev_t x)
{
if (dumpdev == NODEV)
return NOUDEV;
else
return makeudev(devsw(x)->d_bmaj, minor(x));
}
dev_t
udev2dev(udev_t x, int b)
{

7
sys/kern/kern_shutdown.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)kern_shutdown.c 8.3 (Berkeley) 1/21/94
* $Id: kern_shutdown.c,v 1.55 1999/07/17 20:47:50 phk Exp $
* $Id: kern_shutdown.c,v 1.56 1999/07/20 20:55:50 green Exp $
*/
#include "opt_ddb.h"
@ -408,10 +408,7 @@ sysctl_kern_dumpdev SYSCTL_HANDLER_ARGS
int error;
udev_t ndumpdev;
if (dumpdev != NODEV)
ndumpdev = makeudev(devsw(dumpdev)->d_bmaj, minor(dumpdev));
else
ndumpdev = dev2udev(dumpdev);
ndumpdev = dev2budev(dumpdev);
error = sysctl_handle_opaque(oidp, &ndumpdev, sizeof ndumpdev, req);
if (error == 0 && req->newptr != NULL)
error = setdumpdev(udev2dev(ndumpdev, 1));

3
sys/sys/systm.h
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)systm.h 8.7 (Berkeley) 3/29/95
* $Id: systm.h,v 1.91 1999/07/17 18:43:48 phk Exp $
* $Id: systm.h,v 1.92 1999/07/17 20:47:52 phk Exp $
*/
#ifndef _SYS_SYSTM_H_
@ -310,6 +310,7 @@ int major(dev_t x);
int minor(dev_t x);
dev_t makedev(int x, int y);
udev_t dev2udev(dev_t x);
udev_t dev2budev(dev_t x);
dev_t udev2dev(udev_t x, int b);
int uminor(udev_t dev);
int umajor(udev_t dev);

4
sys/vm/vm_swap.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)vm_swap.c 8.5 (Berkeley) 2/17/94
* $Id: vm_swap.c,v 1.77 1999/07/17 18:43:50 phk Exp $
* $Id: vm_swap.c,v 1.78 1999/07/17 19:59:55 phk Exp $
*/
#include "opt_devfs.h"
@ -314,7 +314,7 @@ swaponvp(p, vp, dev, nblks)
nblks = dbtoc(nblks);
sp->sw_vp = vp;
sp->sw_dev = dev2udev(dev);
sp->sw_dev = dev2budev(dev);
sp->sw_device = dev;
sp->sw_flags |= SW_FREED;
sp->sw_nblks = nblks;