diff options
| author | phk <phk@FreeBSD.org> | 1999-09-29 20:05:33 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1999-09-29 20:05:33 +0000 |
| commit | 073b941095e3deeaae66ec3452643c4db25deb08 (patch) | |
| tree | dc46eb78c9f06021563b06118514348a52010687 /sys/ufs | |
| parent | af7bbb9a33441701ff5146882af25965b2f6a467 (diff) | |
| download | FreeBSD-src-073b941095e3deeaae66ec3452643c4db25deb08.zip FreeBSD-src-073b941095e3deeaae66ec3452643c4db25deb08.tar.gz | |
Remove v_maxio from struct vnode.
Replace it with mnt_iosize_max in struct mount.
Nits from: bde
Diffstat (limited to 'sys/ufs')
| -rw-r--r-- | sys/ufs/ffs/ffs_vfsops.c | 4 | ||||
| -rw-r--r-- | sys/ufs/ufs/ufs_bmap.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 9af1c90..2ec065f 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -620,6 +620,10 @@ ffs_mountfs(devvp, mp, p, malloctype) error = VOP_OPEN(devvp, ronly ? FREAD : FREAD|FWRITE, FSCRED, p); if (error) return (error); + if (devvp->v_rdev->si_iosize_max > mp->mnt_iosize_max) + mp->mnt_iosize_max = devvp->v_rdev->si_iosize_max; + if (mp->mnt_iosize_max > MAXPHYS) + mp->mnt_iosize_max = MAXPHYS; if (VOP_IOCTL(devvp, DIOCGPART, (caddr_t)&dpart, FREAD, cred, p) != 0) size = DEV_BSIZE; diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c index 22f83c3..14ef56e 100644 --- a/sys/ufs/ufs/ufs_bmap.c +++ b/sys/ufs/ufs/ufs_bmap.c @@ -133,8 +133,7 @@ ufs_bmaparray(vp, bn, bnp, ap, nump, runp, runb) *runb = 0; } - vp->v_maxio = devvp->v_maxio; - maxrun = vp->v_maxio / mp->mnt_stat.f_iosize - 1; + maxrun = mp->mnt_iosize_max / mp->mnt_stat.f_iosize - 1; xap = ap == NULL ? a : ap; if (!nump) |
