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

s/v_specinfo/v_rdev/

Browse Source
This commit is contained in:
Poul-Henning Kamp 1999-08-13 10:10:12 +00:00
parent 9b68440631
commit 4d4f932326
9 changed files with 33 additions and 34 deletions

12
sys/fs/specfs/spec_vnops.c

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)spec_vnops.c 8.14 (Berkeley) 5/21/95
* $Id: spec_vnops.c,v 1.90 1999/07/20 09:47:45 phk Exp $
* $Id: spec_vnops.c,v 1.91 1999/08/08 18:42:52 phk Exp $
*/
#include <sys/param.h>
@ -288,7 +288,7 @@ spec_read(ap)
* be larger then the physical minimum.
*/
bsize = vp->v_specinfo->si_bsize_best;
bsize = vp->v_rdev->si_bsize_best;
if ((ioctl = bdevsw(dev)->d_ioctl) != NULL &&
(*ioctl)(dev, DIOCGPART, (caddr_t)&dpart, FREAD, p) == 0 &&
@ -372,7 +372,7 @@ spec_write(ap)
* Calculate block size for block device. The block size must
* be larger then the physical minimum.
*/
bsize = vp->v_specinfo->si_bsize_best;
bsize = vp->v_rdev->si_bsize_best;
if ((*bdevsw(vp->v_rdev)->d_ioctl)(vp->v_rdev, DIOCGPART,
(caddr_t)&dpart, FREAD, p) == 0) {
@ -784,11 +784,11 @@ spec_getpages(ap)
* size for the device itself.
*
* We can't use v_specmountpoint because it only exists when the
* block device is mounted. However, we can use v_specinfo.
* block device is mounted. However, we can use v_rdev.
*/
if (vp->v_type == VBLK)
blksiz = vp->v_specinfo->si_bsize_phys;
blksiz = vp->v_rdev->si_bsize_phys;
else
blksiz = DEV_BSIZE;
@ -943,7 +943,7 @@ spec_getattr(ap)
bzero(vap, sizeof (*vap));
if (vp->v_type == VBLK) {
if (vp->v_specinfo)
if (vp->v_rdev)
vap->va_blocksize = vp->v_specmountpoint->mnt_stat.f_iosize;
else
vap->va_blocksize = BLKDEV_IOSIZE;

4
sys/kern/vfs_aio.c

@ -13,7 +13,7 @@
* bad that happens because of using this software isn't the responsibility
* of the author. This software is distributed AS-IS.
*
* $Id: vfs_aio.c,v 1.54 1999/07/01 13:21:40 peter Exp $
* $Id: vfs_aio.c,v 1.55 1999/08/08 18:42:48 phk Exp $
*/
/*
@ -951,7 +951,7 @@ aio_qphysio(p, aiocbe)
return -1;
}
if ((vp->v_specinfo == NULL) || (vp->v_flag & VISTTY)) {
if ((vp->v_rdev == NULL) || (vp->v_flag & VISTTY)) {
return -1;
}

8
sys/kern/vfs_export.c

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95
* $Id: vfs_subr.c,v 1.214 1999/07/26 06:25:17 alc Exp $
* $Id: vfs_subr.c,v 1.215 1999/08/08 18:42:49 phk Exp $
*/
/*
@ -1331,7 +1331,7 @@ loop:
*/
nvp->v_specnext = *vpp;
*vpp = nvp;
nvp->v_specinfo = sinfo = dev;
nvp->v_rdev = sinfo = dev;
simple_unlock(&spechash_slock);
if (vp != NULLVP) {
@ -1888,7 +1888,7 @@ vgonel(vp, p)
* If special device, remove it from special device alias list
* if it is on one.
*/
if ((vp->v_type == VBLK || vp->v_type == VCHR) && vp->v_specinfo != 0) {
if ((vp->v_type == VBLK || vp->v_type == VCHR) && vp->v_rdev != 0) {
simple_lock(&spechash_slock);
if (vp->v_hashchain == vp) {
vp->v_hashchain = vp->v_specnext;
@ -1918,7 +1918,7 @@ vgonel(vp, p)
vp->v_flag &= ~VALIASED;
}
simple_unlock(&spechash_slock);
vp->v_specinfo = NULL;
vp->v_rdev = NULL;
}
/*

8
sys/kern/vfs_subr.c

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95
* $Id: vfs_subr.c,v 1.214 1999/07/26 06:25:17 alc Exp $
* $Id: vfs_subr.c,v 1.215 1999/08/08 18:42:49 phk Exp $
*/
/*
@ -1331,7 +1331,7 @@ loop:
*/
nvp->v_specnext = *vpp;
*vpp = nvp;
nvp->v_specinfo = sinfo = dev;
nvp->v_rdev = sinfo = dev;
simple_unlock(&spechash_slock);
if (vp != NULLVP) {
@ -1888,7 +1888,7 @@ vgonel(vp, p)
* If special device, remove it from special device alias list
* if it is on one.
*/
if ((vp->v_type == VBLK || vp->v_type == VCHR) && vp->v_specinfo != 0) {
if ((vp->v_type == VBLK || vp->v_type == VCHR) && vp->v_rdev != 0) {
simple_lock(&spechash_slock);
if (vp->v_hashchain == vp) {
vp->v_hashchain = vp->v_specnext;
@ -1918,7 +1918,7 @@ vgonel(vp, p)
vp->v_flag &= ~VALIASED;
}
simple_unlock(&spechash_slock);
vp->v_specinfo = NULL;
vp->v_rdev = NULL;
}
/*

12
sys/miscfs/specfs/spec_vnops.c

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)spec_vnops.c 8.14 (Berkeley) 5/21/95
* $Id: spec_vnops.c,v 1.90 1999/07/20 09:47:45 phk Exp $
* $Id: spec_vnops.c,v 1.91 1999/08/08 18:42:52 phk Exp $
*/
#include <sys/param.h>
@ -288,7 +288,7 @@ spec_read(ap)
* be larger then the physical minimum.
*/
bsize = vp->v_specinfo->si_bsize_best;
bsize = vp->v_rdev->si_bsize_best;
if ((ioctl = bdevsw(dev)->d_ioctl) != NULL &&
(*ioctl)(dev, DIOCGPART, (caddr_t)&dpart, FREAD, p) == 0 &&
@ -372,7 +372,7 @@ spec_write(ap)
* Calculate block size for block device. The block size must
* be larger then the physical minimum.
*/
bsize = vp->v_specinfo->si_bsize_best;
bsize = vp->v_rdev->si_bsize_best;
if ((*bdevsw(vp->v_rdev)->d_ioctl)(vp->v_rdev, DIOCGPART,
(caddr_t)&dpart, FREAD, p) == 0) {
@ -784,11 +784,11 @@ spec_getpages(ap)
* size for the device itself.
*
* We can't use v_specmountpoint because it only exists when the
* block device is mounted. However, we can use v_specinfo.
* block device is mounted. However, we can use v_rdev.
*/
if (vp->v_type == VBLK)
blksiz = vp->v_specinfo->si_bsize_phys;
blksiz = vp->v_rdev->si_bsize_phys;
else
blksiz = DEV_BSIZE;
@ -943,7 +943,7 @@ spec_getattr(ap)
bzero(vap, sizeof (*vap));
if (vp->v_type == VBLK) {
if (vp->v_specinfo)
if (vp->v_rdev)
vap->va_blocksize = vp->v_specmountpoint->mnt_stat.f_iosize;
else
vap->va_blocksize = BLKDEV_IOSIZE;

6
sys/sys/conf.h

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)conf.h 8.5 (Berkeley) 1/9/95
* $Id: conf.h,v 1.68 1999/08/08 18:42:59 phk Exp $
* $Id: conf.h,v 1.69 1999/08/09 18:45:20 jdp Exp $
*/
#ifndef _SYS_CONF_H_
@ -73,8 +73,8 @@ struct specinfo {
/*
* Exported shorthand
*/
#define v_hashchain v_specinfo->si_hlist
#define v_specmountpoint v_specinfo->si_mountpoint
#define v_hashchain v_rdev->si_hlist
#define v_specmountpoint v_rdev->si_mountpoint
/*
* Special device management

6
sys/sys/linedisc.h

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)conf.h 8.5 (Berkeley) 1/9/95
* $Id: conf.h,v 1.68 1999/08/08 18:42:59 phk Exp $
* $Id: conf.h,v 1.69 1999/08/09 18:45:20 jdp Exp $
*/
#ifndef _SYS_CONF_H_
@ -73,8 +73,8 @@ struct specinfo {
/*
* Exported shorthand
*/
#define v_hashchain v_specinfo->si_hlist
#define v_specmountpoint v_specinfo->si_mountpoint
#define v_hashchain v_rdev->si_hlist
#define v_specmountpoint v_rdev->si_mountpoint
/*
* Special device management

3
sys/sys/vnode.h

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)vnode.h 8.7 (Berkeley) 2/4/94
* $Id: vnode.h,v 1.92 1999/07/26 06:25:53 alc Exp $
* $Id: vnode.h,v 1.93 1999/08/08 18:43:00 phk Exp $
*/
#ifndef _SYS_VNODE_H_
@ -135,7 +135,6 @@ struct vnode {
};
#define v_mountedhere v_un.vu_mountedhere
#define v_socket v_un.vu_socket
#define v_specinfo v_un.vu_spec.vu_specinfo
#define v_rdev v_un.vu_spec.vu_specinfo
#define v_specnext v_un.vu_spec.vu_specnext
#define v_fifoinfo v_un.vu_fifoinfo

8
sys/ufs/ufs/ufs_vnops.c

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)ufs_vnops.c 8.27 (Berkeley) 5/27/95
* $Id: ufs_vnops.c,v 1.116 1999/07/13 18:20:13 mckusick Exp $
* $Id: ufs_vnops.c,v 1.117 1999/08/08 18:43:04 phk Exp $
*/
#include "opt_quota.h"
@ -398,14 +398,14 @@ ufs_getattr(ap)
vap->va_gen = ip->i_gen;
/*
* Use the information contained in v_specinfo for VBLK and VCHR
* Use the information contained in v_rdev for VBLK and VCHR
* vnodes, and in the underlying mount point for (typically) VREG
* vnodes. Note that vp->v_specmountpoint can be NULL.
*/
if (vp->v_type == VBLK) {
vap->va_blocksize = vp->v_specinfo->si_bsize_best;
vap->va_blocksize = vp->v_rdev->si_bsize_best;
} else if (vp->v_type == VCHR) {
vap->va_blocksize = vp->v_specinfo->si_bsize_max;
vap->va_blocksize = vp->v_rdev->si_bsize_max;
} else {
vap->va_blocksize = vp->v_mount->mnt_stat.f_iosize;
}