summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2003-10-18 11:06:15 +0000
committerphk <phk@FreeBSD.org>2003-10-18 11:06:15 +0000
commit7279dea9d58cab07cda558d87a324cf930c1d69d (patch)
treed972b866c7baf7d8d3327f9499575826d8a172c9
parent011e3f22c7a887a108a8b6642229961d4d763312 (diff)
downloadFreeBSD-src-7279dea9d58cab07cda558d87a324cf930c1d69d.zip
FreeBSD-src-7279dea9d58cab07cda558d87a324cf930c1d69d.tar.gz
Initialize b_offset before calling VOP_STRATEGY/VOP_SPECSTRATEGY.
Remove various comments of KASSERTS and comments about B_PHYS which does not apply anymore.
-rw-r--r--sys/fs/hpfs/hpfs_vnops.c1
-rw-r--r--sys/fs/msdosfs/msdosfs_vnops.c1
-rw-r--r--sys/fs/nwfs/nwfs_vnops.c1
-rw-r--r--sys/fs/smbfs/smbfs_vnops.c1
-rw-r--r--sys/fs/specfs/spec_vnops.c1
-rw-r--r--sys/fs/udf/udf_vnops.c1
6 files changed, 3 insertions, 3 deletions
diff --git a/sys/fs/hpfs/hpfs_vnops.c b/sys/fs/hpfs/hpfs_vnops.c
index 38f54e6..7df5b49 100644
--- a/sys/fs/hpfs/hpfs_vnops.c
+++ b/sys/fs/hpfs/hpfs_vnops.c
@@ -674,6 +674,7 @@ hpfs_strategy(ap)
return (0);
}
bp->b_dev = hp->h_devvp->v_rdev;
+ bp->b_offset = dbtob(bp->b_blkno);
VOP_SPECSTRATEGY(hp->h_devvp, bp);
return (0);
}
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index a4c60cc..c483e44 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -1785,6 +1785,7 @@ msdosfs_strategy(ap)
*/
vp = dep->de_devvp;
bp->b_dev = vp->v_rdev;
+ bp->b_offset = dbtob(bp->b_blkno);
VOP_SPECSTRATEGY(vp, bp);
return (0);
}
diff --git a/sys/fs/nwfs/nwfs_vnops.c b/sys/fs/nwfs/nwfs_vnops.c
index ab8a4f2..4215e63 100644
--- a/sys/fs/nwfs/nwfs_vnops.c
+++ b/sys/fs/nwfs/nwfs_vnops.c
@@ -799,7 +799,6 @@ static int nwfs_strategy (ap)
KASSERT(ap->a_vp == ap->a_bp->b_vp, ("%s(%p != %p)",
__func__, ap->a_vp, ap->a_bp->b_vp));
NCPVNDEBUG("\n");
- KASSERT(!(bp->b_flags & B_PHYS), ("nwfs physio"));
if (bp->b_flags & B_ASYNC)
td = (struct thread *)0;
else
diff --git a/sys/fs/smbfs/smbfs_vnops.c b/sys/fs/smbfs/smbfs_vnops.c
index 383f565..f2e0f1e 100644
--- a/sys/fs/smbfs/smbfs_vnops.c
+++ b/sys/fs/smbfs/smbfs_vnops.c
@@ -845,7 +845,6 @@ smbfs_strategy (ap)
KASSERT(ap->a_vp == ap->a_bp->b_vp, ("%s(%p != %p)",
__func__, ap->a_vp, ap->a_bp->b_vp));
SMBVDEBUG("\n");
- KASSERT(!(bp->b_flags & B_PHYS), ("smbfs physio"));
if (bp->b_flags & B_ASYNC)
td = (struct thread *)0;
else
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c
index 8b5d2a5..bde0786 100644
--- a/sys/fs/specfs/spec_vnops.c
+++ b/sys/fs/specfs/spec_vnops.c
@@ -730,7 +730,6 @@ spec_getpages(ap)
bp->b_iocmd = BIO_READ;
bp->b_iodone = bdone;
- /* B_PHYS is not set, but it is nice to fill this in. */
KASSERT(bp->b_rcred == NOCRED, ("leaking read ucred"));
KASSERT(bp->b_wcred == NOCRED, ("leaking write ucred"));
bp->b_rcred = crhold(curthread->td_ucred);
diff --git a/sys/fs/udf/udf_vnops.c b/sys/fs/udf/udf_vnops.c
index 5924559..1a2ae43 100644
--- a/sys/fs/udf/udf_vnops.c
+++ b/sys/fs/udf/udf_vnops.c
@@ -839,6 +839,7 @@ udf_strategy(struct vop_strategy_args *a)
}
vp = node->i_devvp;
bp->b_dev = vp->v_rdev;
+ bp->b_offset = dbtob(bp->b_blkno);
VOP_SPECSTRATEGY(vp, bp);
return (0);
}
OpenPOWER on IntegriCloud