diff options
Diffstat (limited to 'sys/ufs')
| -rw-r--r-- | sys/ufs/dir.h | 2 | ||||
| -rw-r--r-- | sys/ufs/ufs_disksubr.c | 7 | ||||
| -rw-r--r-- | sys/ufs/ufs_lookup.c | 2 | ||||
| -rw-r--r-- | sys/ufs/ufs_vfsops.c | 2 | ||||
| -rw-r--r-- | sys/ufs/ufs_vnops.c | 7 |
5 files changed, 9 insertions, 11 deletions
diff --git a/sys/ufs/dir.h b/sys/ufs/dir.h index 963ead42dec9..00e91e9d0d8f 100644 --- a/sys/ufs/dir.h +++ b/sys/ufs/dir.h @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: @(#)dir.h 7.10 (Berkeley) 3/25/91 - * $Id: dir.h,v 1.2.4.1 1994/05/04 07:59:08 rgrimes Exp $ + * $Id: dir.h,v 1.3 1994/05/04 08:33:04 rgrimes Exp $ */ #ifndef _DIR_H_ diff --git a/sys/ufs/ufs_disksubr.c b/sys/ufs/ufs_disksubr.c index e80b67e371b1..5c155992e592 100644 --- a/sys/ufs/ufs_disksubr.c +++ b/sys/ufs/ufs_disksubr.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91 - * $Id: ufs_disksubr.c,v 1.5 1993/12/19 00:55:43 wollman Exp $ + * $Id: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $ */ #include "param.h" @@ -493,6 +493,7 @@ bounds_check_with_label(struct buf *bp, struct disklabel *lp, int wlabel) int maxsz = p->p_size, sz = (bp->b_bcount + DEV_BSIZE - 1) >> DEV_BSHIFT; +#if !defined(DISKLABEL_UNPROTECTED) /* overwriting disk label ? */ /* XXX should also protect bootstrap in first 8K */ if (bp->b_blkno + p->p_offset <= LABELSECTOR + labelsect && @@ -503,6 +504,7 @@ bounds_check_with_label(struct buf *bp, struct disklabel *lp, int wlabel) bp->b_error = EROFS; goto bad; } +#endif /* !defined(DISKLABEL_UNPROTECTED) */ #if defined(DOSBBSECTOR) && defined(notyet) /* overwriting master boot record? */ @@ -530,7 +532,8 @@ bounds_check_with_label(struct buf *bp, struct disklabel *lp, int wlabel) } /* calculate cylinder for disksort to order transfers with */ - bp->b_cylin = (bp->b_blkno + p->p_offset) / lp->d_secpercyl; + bp->b_pblkno = bp->b_blkno + p->p_offset; + bp->b_cylin = bp->b_pblkno / lp->d_secpercyl; return(1); bad: diff --git a/sys/ufs/ufs_lookup.c b/sys/ufs/ufs_lookup.c index 06c1cb27314d..aa4c13ebfb0c 100644 --- a/sys/ufs/ufs_lookup.c +++ b/sys/ufs/ufs_lookup.c @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: @(#)ufs_lookup.c 7.33 (Berkeley) 5/19/91 - * $Id: ufs_lookup.c,v 1.6.2.1 1994/05/04 07:59:10 rgrimes Exp $ + * $Id: ufs_lookup.c,v 1.7 1994/05/04 08:33:11 rgrimes Exp $ */ #include "param.h" diff --git a/sys/ufs/ufs_vfsops.c b/sys/ufs/ufs_vfsops.c index 5eaaf387e572..d7d5de227260 100644 --- a/sys/ufs/ufs_vfsops.c +++ b/sys/ufs/ufs_vfsops.c @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: @(#)ufs_vfsops.c 7.56 (Berkeley) 6/28/91 - * $Id: ufs_vfsops.c,v 1.6.2.1 1994/05/04 07:59:13 rgrimes Exp $ + * $Id: ufs_vfsops.c,v 1.7 1994/05/04 08:33:15 rgrimes Exp $ */ #include "param.h" diff --git a/sys/ufs/ufs_vnops.c b/sys/ufs/ufs_vnops.c index 096cb1f3a338..39fad0e55885 100644 --- a/sys/ufs/ufs_vnops.c +++ b/sys/ufs/ufs_vnops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)ufs_vnops.c 7.64 (Berkeley) 5/16/91 - * $Id: ufs_vnops.c,v 1.14 1994/01/19 21:09:26 jtc Exp $ + * $Id: ufs_vnops.c,v 1.16 1994/06/12 04:05:53 davidg Exp $ */ #include "param.h" @@ -524,10 +524,6 @@ ufs_read(vp, uio, ioflag, cred) return (error); } error = uiomove(bp->b_un.b_addr + on, (int)n, uio); -#if OMIT /* 20 Aug 92*/ - if (n + on == fs->fs_bsize || uio->uio_offset == ip->i_size) - bp->b_flags |= B_AGE; -#endif /* OMIT*/ brelse(bp); } while (error == 0 && uio->uio_resid > 0 && n != 0); return (error); @@ -617,7 +613,6 @@ ufs_write(vp, uio, ioflag, cred) if (ioflag & IO_SYNC) (void) bwrite(bp); else if (n + on == fs->fs_bsize) { - bp->b_flags |= B_AGE; bawrite(bp); } else bdwrite(bp); |