summaryrefslogtreecommitdiff
path: root/sys/ufs
diff options
context:
space:
mode:
Diffstat (limited to 'sys/ufs')
-rw-r--r--sys/ufs/ext2fs/ext2fs_balloc.c8
-rw-r--r--sys/ufs/ext2fs/ext2fs_readwrite.c12
-rw-r--r--sys/ufs/ext2fs/ext2fs_vfsops.c4
-rw-r--r--sys/ufs/ffs/ffs_balloc.c4
-rw-r--r--sys/ufs/ffs/ffs_inode.c6
-rw-r--r--sys/ufs/ffs/ffs_softdep.c4
-rw-r--r--sys/ufs/ffs/ffs_vnops.c4
-rw-r--r--sys/ufs/ufs/ufs_inode.c10
-rw-r--r--sys/ufs/ufs/ufs_readwrite.c29
9 files changed, 40 insertions, 41 deletions
diff --git a/sys/ufs/ext2fs/ext2fs_balloc.c b/sys/ufs/ext2fs/ext2fs_balloc.c
index 78fb0a8371c..a6daf74d8c6 100644
--- a/sys/ufs/ext2fs/ext2fs_balloc.c
+++ b/sys/ufs/ext2fs/ext2fs_balloc.c
@@ -362,7 +362,7 @@ ext2fs_ballocn(v)
UVMHIST_LOG(ubchist, "old 0x%x new 0x%x",
ip->i_e2fs_size, off + bsize,0,0);
ip->i_e2fs_size = off + bsize;
- if (vp->v_uvm.u_size < ip->i_e2fs_size) {
+ if (vp->v_size < ip->i_e2fs_size) {
uvm_vnp_setsize(vp, ip->i_e2fs_size);
}
}
@@ -396,11 +396,11 @@ ext2fs_balloc_range(vp, off, len, cred, flags)
struct vm_page *pgs[ppb];
UVMHIST_FUNC("ext2fs_balloc_range"); UVMHIST_CALLED(ubchist);
UVMHIST_LOG(ubchist, "vp %p off 0x%x len 0x%x u_size 0x%x",
- vp, off, len, vp->v_uvm.u_size);
+ vp, off, len, vp->v_size);
error = 0;
- uobj = &vp->v_uvm.u_obj;
- oldeof = vp->v_uvm.u_size;
+ uobj = &vp->v_uobj;
+ oldeof = vp->v_size;
eof = max(oldeof, off + len);
UVMHIST_LOG(ubchist, "new eof 0x%x", eof,0,0,0);
pgs[0] = NULL;
diff --git a/sys/ufs/ext2fs/ext2fs_readwrite.c b/sys/ufs/ext2fs/ext2fs_readwrite.c
index 94424055733..03768d06b42 100644
--- a/sys/ufs/ext2fs/ext2fs_readwrite.c
+++ b/sys/ufs/ext2fs/ext2fs_readwrite.c
@@ -119,7 +119,7 @@ ext2fs_read(v)
if (bytelen == 0) {
break;
}
- win = ubc_alloc(&vp->v_uvm.u_obj, uio->uio_offset,
+ win = ubc_alloc(&vp->v_uobj, uio->uio_offset,
&bytelen, UBC_READ);
error = uiomove(win, bytelen, uio);
ubc_release(win, 0);
@@ -281,7 +281,7 @@ ext2fs_write(v)
if (error) {
break;
}
- win = ubc_alloc(&vp->v_uvm.u_obj, uio->uio_offset,
+ win = ubc_alloc(&vp->v_uobj, uio->uio_offset,
&bytelen, UBC_WRITE);
error = uiomove(win, bytelen, uio);
ubc_release(win, 0);
@@ -295,11 +295,11 @@ ext2fs_write(v)
*/
if (oldoff >> 16 != uio->uio_offset >> 16) {
- simple_lock(&vp->v_uvm.u_obj.vmobjlock);
- rv = vp->v_uvm.u_obj.pgops->pgo_flush(
- &vp->v_uvm.u_obj, (oldoff >> 16) << 16,
+ simple_lock(&vp->v_uobj.vmobjlock);
+ rv = vp->v_uobj.pgops->pgo_flush(
+ &vp->v_uobj, (oldoff >> 16) << 16,
(uio->uio_offset >> 16) << 16, PGO_CLEANIT);
- simple_unlock(&vp->v_uvm.u_obj.vmobjlock);
+ simple_unlock(&vp->v_uobj.vmobjlock);
}
}
goto out;
diff --git a/sys/ufs/ext2fs/ext2fs_vfsops.c b/sys/ufs/ext2fs/ext2fs_vfsops.c
index e438268acbc..87eab5f5c2b 100644
--- a/sys/ufs/ext2fs/ext2fs_vfsops.c
+++ b/sys/ufs/ext2fs/ext2fs_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ext2fs_vfsops.c,v 1.17 2001/11/27 05:27:12 art Exp $ */
+/* $OpenBSD: ext2fs_vfsops.c,v 1.18 2001/12/10 02:19:34 art Exp $ */
/* $NetBSD: ext2fs_vfsops.c,v 1.40 2000/11/27 08:39:53 chs Exp $ */
/*
@@ -930,7 +930,7 @@ ext2fs_vget(mp, ino, vpp)
ip->i_flag |= IN_MODIFIED;
}
- vp->v_uvm.u_size = ip->i_e2fs_size;
+ vp->v_size = ip->i_e2fs_size;
*vpp = vp;
return (0);
}
diff --git a/sys/ufs/ffs/ffs_balloc.c b/sys/ufs/ffs/ffs_balloc.c
index 5f6ddc3d94e..dfbf97c232c 100644
--- a/sys/ufs/ffs/ffs_balloc.c
+++ b/sys/ufs/ffs/ffs_balloc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ffs_balloc.c,v 1.19 2001/11/27 05:27:12 art Exp $ */
+/* $OpenBSD: ffs_balloc.c,v 1.20 2001/12/10 02:19:34 art Exp $ */
/* $NetBSD: ffs_balloc.c,v 1.3 1996/02/09 22:22:21 christos Exp $ */
/*
@@ -448,7 +448,7 @@ ffs_ballocn(v)
if (ip->i_ffs_size < off + bsize) {
ip->i_ffs_size = off + bsize;
- if (vp->v_uvm.u_size < ip->i_ffs_size) {
+ if (vp->v_size < ip->i_ffs_size) {
uvm_vnp_setsize(vp, ip->i_ffs_size);
}
}
diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c
index cddf6a368ca..64f0aef27a3 100644
--- a/sys/ufs/ffs/ffs_inode.c
+++ b/sys/ufs/ffs/ffs_inode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ffs_inode.c,v 1.26 2001/11/27 05:27:12 art Exp $ */
+/* $OpenBSD: ffs_inode.c,v 1.27 2001/12/10 02:19:34 art Exp $ */
/* $NetBSD: ffs_inode.c,v 1.10 1996/05/11 18:27:19 mycroft Exp $ */
/*
@@ -228,11 +228,11 @@ ffs_truncate(struct inode *oip, off_t length, int flags, struct ucred *cred)
size = blksize(fs, oip, lblkno(fs, length));
eoz = min(lblktosize(fs, lblkno(fs, length)) + size, osize);
uvm_vnp_zerorange(ovp, length, eoz - length);
- uobj = &ovp->v_uvm.u_obj;
+ uobj = &ovp->v_uobj;
simple_lock(&uobj->vmobjlock);
uobj->pgops->pgo_flush(uobj, length, eoz,
PGO_CLEANIT|PGO_DEACTIVATE|PGO_SYNCIO);
- simple_unlock(&ovp->v_uvm.u_obj.vmobjlock);
+ simple_unlock(&uobj->vmobjlock);
}
lockmgr(&ovp->v_glock, LK_EXCLUSIVE, NULL, p);
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index 624a862f3e7..2dfed4d83bd 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ffs_softdep.c,v 1.29 2001/12/05 00:36:17 niklas Exp $ */
+/* $OpenBSD: ffs_softdep.c,v 1.30 2001/12/10 02:19:34 art Exp $ */
/*
* Copyright 1998, 2000 Marshall Kirk McKusick. All Rights Reserved.
*
@@ -4362,7 +4362,7 @@ flush_inodedep_deps(fs, ino)
if (vp == NULL)
panic("flush_inodedep_deps: null vp");
#endif
- uobj = &vp->v_uvm.u_obj;
+ uobj = &vp->v_uobj;
/*
* This work is done in two passes. The first pass grabs most
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index f3cfb4c3f46..6bf1ddc5642 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ffs_vnops.c,v 1.22 2001/12/04 22:44:32 art Exp $ */
+/* $OpenBSD: ffs_vnops.c,v 1.23 2001/12/10 02:19:34 art Exp $ */
/* $NetBSD: ffs_vnops.c,v 1.7 1996/05/11 18:27:24 mycroft Exp $ */
/*
@@ -252,7 +252,7 @@ ffs_fsync(v)
s = splbio();
if (vp->v_type == VREG) {
- uobj = &vp->v_uvm.u_obj;
+ uobj = &vp->v_uobj;
simple_lock(&uobj->vmobjlock);
(uobj->pgops->pgo_flush)(uobj, 0, 0, PGO_ALLPAGES|PGO_CLEANIT|
((ap->a_waitfor == MNT_WAIT) ? PGO_SYNCIO : 0));
diff --git a/sys/ufs/ufs/ufs_inode.c b/sys/ufs/ufs/ufs_inode.c
index c86f6d7d274..8c328b83f39 100644
--- a/sys/ufs/ufs/ufs_inode.c
+++ b/sys/ufs/ufs/ufs_inode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ufs_inode.c,v 1.13 2001/11/30 00:32:58 art Exp $ */
+/* $OpenBSD: ufs_inode.c,v 1.14 2001/12/10 02:19:34 art Exp $ */
/* $NetBSD: ufs_inode.c,v 1.7 1996/05/11 18:27:52 mycroft Exp $ */
/*
@@ -177,22 +177,22 @@ ufs_balloc_range(vp, off, len, cred, flags)
struct vm_page *pgs1[ppb], *pgs2[ppb];
UVMHIST_FUNC("ufs_balloc_range"); UVMHIST_CALLED(ubchist);
UVMHIST_LOG(ubchist, "vp %p off 0x%x len 0x%x u_size 0x%x",
- vp, off, len, vp->v_uvm.u_size);
+ vp, off, len, vp->v_size);
- oldeof = vp->v_uvm.u_size;
+ oldeof = vp->v_size;
error = VOP_SIZE(vp, oldeof, &oldeob);
if (error) {
return error;
}
- neweof = MAX(vp->v_uvm.u_size, off + len);
+ neweof = MAX(vp->v_size, off + len);
error = VOP_SIZE(vp, neweof, &neweob);
if (error) {
return error;
}
error = 0;
- uobj = &vp->v_uvm.u_obj;
+ uobj = &vp->v_uobj;
pgs1[0] = pgs2[0] = NULL;
/*
diff --git a/sys/ufs/ufs/ufs_readwrite.c b/sys/ufs/ufs/ufs_readwrite.c
index e0777e4b55f..cb1da0934ff 100644
--- a/sys/ufs/ufs/ufs_readwrite.c
+++ b/sys/ufs/ufs/ufs_readwrite.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ufs_readwrite.c,v 1.20 2001/11/27 05:27:12 art Exp $ */
+/* $OpenBSD: ufs_readwrite.c,v 1.21 2001/12/10 02:19:34 art Exp $ */
/* $NetBSD: ufs_readwrite.c,v 1.9 1996/05/11 18:27:57 mycroft Exp $ */
/*-
@@ -120,7 +120,7 @@ READ(v)
uio->uio_resid);
if (bytelen == 0)
break;
- win = ubc_alloc(&vp->v_uvm.u_obj, uio->uio_offset,
+ win = ubc_alloc(&vp->v_uobj, uio->uio_offset,
&bytelen, UBC_READ);
error = uiomove(win, bytelen, uio);
ubc_release(win, 0);
@@ -266,6 +266,7 @@ WRITE(v)
goto bcache;
while (uio->uio_resid > 0) {
+ struct uvm_object *uobj = &vp->v_uobj;
oldoff = uio->uio_offset;
blkoffset = blkoff(fs, uio->uio_offset);
bytelen = min(fs->fs_bsize - blkoffset, uio->uio_resid);
@@ -281,8 +282,7 @@ WRITE(v)
return error;
}
- win = ubc_alloc(&vp->v_uvm.u_obj, uio->uio_offset, &bytelen,
- UBC_WRITE);
+ win = ubc_alloc(uobj, uio->uio_offset, &bytelen, UBC_WRITE);
error = uiomove(win, bytelen, uio);
ubc_release(win, 0);
@@ -292,7 +292,7 @@ WRITE(v)
*/
if (ioflag & IO_SYNC) {
- simple_lock(&vp->v_uvm.u_obj.vmobjlock);
+ simple_lock(&uobj->vmobjlock);
#if 1
/*
* XXX
@@ -303,24 +303,23 @@ WRITE(v)
* is complicated so we'll work around it for now.
*/
- rv = vp->v_uvm.u_obj.pgops->pgo_flush(
- &vp->v_uvm.u_obj,
- oldoff & ~(fs->fs_bsize - 1),
+ rv = uobj->pgops->pgo_flush(
+ uobj, oldoff & ~(fs->fs_bsize - 1),
(oldoff + bytelen + fs->fs_bsize - 1) &
~(fs->fs_bsize - 1),
PGO_CLEANIT|PGO_SYNCIO);
#else
- rv = vp->v_uvm.u_obj.pgops->pgo_flush(
- &vp->v_uvm.u_obj, oldoff, oldoff + bytelen,
+ rv = uobj->pgops->pgo_flush(
+ uobj, oldoff, oldoff + bytelen,
PGO_CLEANIT|PGO_SYNCIO);
#endif
- simple_unlock(&vp->v_uvm.u_obj.vmobjlock);
+ simple_unlock(uobj->vmobjlock);
} else if (oldoff >> 16 != uio->uio_offset >> 16) {
- simple_lock(&vp->v_uvm.u_obj.vmobjlock);
- rv = vp->v_uvm.u_obj.pgops->pgo_flush(
- &vp->v_uvm.u_obj, (oldoff >> 16) << 16,
+ simple_lock(&uobj->vmobjlock);
+ rv = uobj->pgops->pgo_flush(uobj,
+ (oldoff >> 16) << 16,
(uio->uio_offset >> 16) << 16, PGO_CLEANIT);
- simple_unlock(&vp->v_uvm.u_obj.vmobjlock);
+ simple_unlock(&uobj->vmobjlock);
}
if (error) {
break;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 20:26:25 +0000