diff options
Diffstat (limited to 'sys/ufs/lfs')
| -rw-r--r-- | sys/ufs/lfs/lfs_balloc.c | 3 | ||||
| -rw-r--r-- | sys/ufs/lfs/lfs_inode.c | 4 | ||||
| -rw-r--r-- | sys/ufs/lfs/lfs_segment.c | 3 | ||||
| -rw-r--r-- | sys/ufs/lfs/lfs_subr.c | 7 | ||||
| -rw-r--r-- | sys/ufs/lfs/lfs_syscalls.c | 6 |
5 files changed, 8 insertions, 15 deletions
diff --git a/sys/ufs/lfs/lfs_balloc.c b/sys/ufs/lfs/lfs_balloc.c index b7cf755..f8063c8 100644 --- a/sys/ufs/lfs/lfs_balloc.c +++ b/sys/ufs/lfs/lfs_balloc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_balloc.c 8.1 (Berkeley) 6/11/93 - * $Id$ + * $Id: lfs_balloc.c,v 1.2 1994/08/02 07:54:30 davidg Exp $ */ #include <sys/param.h> #include <sys/buf.h> @@ -129,6 +129,7 @@ lfs_balloc(vp, iosize, lbn, bpp) else { bp->b_blkno = daddr; bp->b_flags |= B_READ; + vfs_busy_pages(bp, 0); VOP_STRATEGY(bp); return(biowait(bp)); } diff --git a/sys/ufs/lfs/lfs_inode.c b/sys/ufs/lfs/lfs_inode.c index 4e23016..68169a3 100644 --- a/sys/ufs/lfs/lfs_inode.c +++ b/sys/ufs/lfs/lfs_inode.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_inode.c 8.5 (Berkeley) 12/30/93 - * $Id: lfs_inode.c,v 1.4 1994/10/10 01:04:50 phk Exp $ + * $Id: lfs_inode.c,v 1.5 1995/01/04 23:46:31 gibbs Exp $ */ #include <sys/param.h> @@ -235,7 +235,7 @@ lfs_truncate(ap) ip->i_size = length; size = blksize(fs); bzero((char *)bp->b_data + offset, (u_int)(size - offset)); - allocbuf(bp, size); + allocbuf(bp, size, 0); if (e1 = VOP_BWRITE(bp)) return (e1); } diff --git a/sys/ufs/lfs/lfs_segment.c b/sys/ufs/lfs/lfs_segment.c index d19de2d..d393713 100644 --- a/sys/ufs/lfs/lfs_segment.c +++ b/sys/ufs/lfs/lfs_segment.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_segment.c 8.5 (Berkeley) 1/4/94 - * $Id: lfs_segment.c,v 1.5 1994/11/17 01:30:49 gibbs Exp $ + * $Id: lfs_segment.c,v 1.6 1995/01/04 23:46:32 gibbs Exp $ */ #include <sys/param.h> @@ -1091,7 +1091,6 @@ lfs_newbuf(vp, daddr, size) bp = getpbuf(); if (nbytes) bp->b_data = lfs_alloc_buffer( nbytes); - bgetvp(vp, bp); bp->b_bufsize = size; bp->b_bcount = size; bp->b_lblkno = daddr; diff --git a/sys/ufs/lfs/lfs_subr.c b/sys/ufs/lfs/lfs_subr.c index 82e8068..52d1574 100644 --- a/sys/ufs/lfs/lfs_subr.c +++ b/sys/ufs/lfs/lfs_subr.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_subr.c 8.2 (Berkeley) 9/21/93 - * $Id: lfs_subr.c,v 1.4 1994/11/17 01:30:51 gibbs Exp $ + * $Id: lfs_subr.c,v 1.5 1995/01/04 23:46:32 gibbs Exp $ */ #include <sys/param.h> @@ -147,11 +147,8 @@ lfs_segunlock(fs) if (sp->bpp != sp->cbpp) { /* Free allocated segment summary */ fs->lfs_offset -= LFS_SUMMARY_SIZE / DEV_BSIZE; -/* free((*sp->bpp)->b_data, M_SEGMENT); */ - lfs_free_buffer((*sp->bpp)->b_data, roundup( (*sp->bpp)->b_bufsize, DEV_BSIZE)); - /* free(*sp->bpp, M_SEGMENT); */ + lfs_free_buffer((*sp->bpp)->b_data, roundup((*sp->bpp)->b_bufsize, DEV_BSIZE)); relpbuf(*sp->bpp); - } else printf ("unlock to 0 with no summary"); free(sp->bpp, M_SEGMENT); diff --git a/sys/ufs/lfs/lfs_syscalls.c b/sys/ufs/lfs/lfs_syscalls.c index 71ac5e9..73c5045 100644 --- a/sys/ufs/lfs/lfs_syscalls.c +++ b/sys/ufs/lfs/lfs_syscalls.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_syscalls.c 8.5 (Berkeley) 4/20/94 - * $Id: lfs_syscalls.c,v 1.4 1994/11/17 01:30:52 gibbs Exp $ + * $Id: lfs_syscalls.c,v 1.5 1995/01/04 23:46:33 gibbs Exp $ */ #include <sys/param.h> @@ -238,10 +238,6 @@ err2: lfs_vunref(vp); /* Free up fakebuffers */ for (bpp = --sp->cbpp; bpp >= sp->bpp; --bpp) if ((*bpp)->b_flags & B_CALL) { - brelvp(*bpp); -/* - free(*bpp, M_SEGMENT); -*/ relpbuf(*bpp); } else brelse(*bpp); |
