diff options
| author | phk <phk@FreeBSD.org> | 2004-06-17 17:16:53 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2004-06-17 17:16:53 +0000 |
| commit | 40dd98a3bd2049465e7644b361b60da41a46efa0 (patch) | |
| tree | fe8b297144afd6d6f7db41275c72cb5eb663ec02 /sys/vm | |
| parent | 9acfe1e733142ca875624a3acbf96c4ff27b36a4 (diff) | |
| download | FreeBSD-src-40dd98a3bd2049465e7644b361b60da41a46efa0.zip FreeBSD-src-40dd98a3bd2049465e7644b361b60da41a46efa0.tar.gz | |
Second half of the dev_t cleanup.
The big lines are:
NODEV -> NULL
NOUDEV -> NODEV
udev_t -> dev_t
udev2dev() -> findcdev()
Various minor adjustments including handling of userland access to kernel
space struct cdev etc.
Diffstat (limited to 'sys/vm')
| -rw-r--r-- | sys/vm/swap_pager.c | 12 | ||||
| -rw-r--r-- | sys/vm/vm_param.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 586ec82..66483e6 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -154,7 +154,7 @@ struct swdevt { int sw_flags; int sw_nblks; int sw_used; - udev_t sw_udev; + dev_t sw_dev; struct vnode *sw_vp; void *sw_id; swblk_t sw_first; @@ -2079,7 +2079,7 @@ done2: } static void -swaponsomething(struct vnode *vp, void *id, u_long nblks, sw_strategy_t *strategy, sw_close_t *close, udev_t udev) +swaponsomething(struct vnode *vp, void *id, u_long nblks, sw_strategy_t *strategy, sw_close_t *close, dev_t dev) { struct swdevt *sp, *tsp; swblk_t dvbase; @@ -2107,7 +2107,7 @@ swaponsomething(struct vnode *vp, void *id, u_long nblks, sw_strategy_t *strateg sp = malloc(sizeof *sp, M_VMPGDATA, M_WAITOK | M_ZERO); sp->sw_vp = vp; sp->sw_id = id; - sp->sw_udev = udev; + sp->sw_dev = dev; sp->sw_flags = 0; sp->sw_nblks = nblks; sp->sw_used = 0; @@ -2293,7 +2293,7 @@ sysctl_vm_swap_info(SYSCTL_HANDLER_ARGS) if (n == *name) { mtx_unlock(&sw_dev_mtx); xs.xsw_version = XSWDEV_VERSION; - xs.xsw_dev = sp->sw_udev; + xs.xsw_dev = sp->sw_dev; xs.xsw_flags = sp->sw_flags; xs.xsw_nblks = sp->sw_nblks; xs.xsw_used = sp->sw_used; @@ -2533,7 +2533,7 @@ swapdev_strategy(struct buf *bp, struct swdevt *sp) int s; struct vnode *vp, *vp2; - bp->b_dev = NODEV; + bp->b_dev = NULL; bp->b_blkno = ctodb(bp->b_blkno - sp->sw_first); vp2 = sp->sw_id; @@ -2598,6 +2598,6 @@ swaponvp(struct thread *td, struct vnode *vp, u_long nblks) return (error); swaponsomething(vp, vp, nblks, swapdev_strategy, swapdev_close, - NOUDEV); + NODEV); return (0); } diff --git a/sys/vm/vm_param.h b/sys/vm/vm_param.h index 46827ce..dab1245 100644 --- a/sys/vm/vm_param.h +++ b/sys/vm/vm_param.h @@ -107,7 +107,7 @@ #define XSWDEV_VERSION 1 struct xswdev { u_int xsw_version; - udev_t xsw_dev; + dev_t xsw_dev; int xsw_flags; int xsw_nblks; int xsw_used; |
