Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a bug in which FINFOs were written with a version number of zero.

Browse Source 
Add assertions and add this to the DEBUG fip test in lfs_writeseg.
This commit is contained in:
perseant 2006-05-20 01:10:18 +00:00
parent 0d1e2d0056
commit 0e0bb04d7a
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/ufs/lfs/lfs_segment.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lfs_segment.c,v 1.180 2006/05/18 23:15:09 perseant Exp $ */
/* $NetBSD: lfs_segment.c,v 1.181 2006/05/20 01:10:18 perseant Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.180 2006/05/18 23:15:09 perseant Exp $");
__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.181 2006/05/20 01:10:18 perseant Exp $");
#ifdef DEBUG
# define vndebug(vp, str) do { \
@ -819,11 +819,9 @@ lfs_segwrite(struct mount *mp, int flags)
int
lfs_writefile(struct lfs *fs, struct segment *sp, struct vnode *vp)
{
struct buf *bp;
struct finfo *fip;
struct inode *ip;
IFILE *ifp;
int i, frag, vers;
int i, frag;
int error;
ASSERT_SEGLOCK(fs);
@ -831,10 +829,7 @@ lfs_writefile(struct lfs *fs, struct segment *sp, struct vnode *vp)
ip = VTOI(vp);
fip = sp->fip;
LFS_IENTRY(ifp, fs, fip->fi_ino, bp);
vers = ifp->if_version;
brelse(bp);
lfs_acquire_finfo(fs, ip->i_number, vers);
lfs_acquire_finfo(fs, ip->i_number, ip->i_gen);
if (vp->v_flag & VDIROP)
((SEGSUM *)(sp->segsum))->ss_flags |= (SS_DIROP|SS_CONT);
@ -1872,10 +1867,11 @@ lfs_writeseg(struct lfs *fs, struct segment *sp)
ssp = (SEGSUM *)sp->segsum;
#ifdef DEBUG
/* Check for zero-length FINFO entries. */
/* Check for zero-length and zero-version FINFO entries. */
fip = (struct finfo *)((caddr_t)ssp + SEGSUM_SIZE(fs));
for (findex = 0; findex < ssp->ss_nfinfo; findex++) {
KDASSERT(fip->fi_nblocks > 0);
KDASSERT(fip->fi_version > 0);
fip = (FINFO *)((caddr_t)fip + FINFOSIZE +
sizeof(int32_t) * fip->fi_nblocks);
}
@ -2675,6 +2671,8 @@ lfs_acquire_finfo(struct lfs *fs, ino_t ino, int vers)
{
struct segment *sp = fs->lfs_sp;
KASSERT(vers > 0);
if (sp->seg_bytes_left < fs->lfs_bsize ||
sp->sum_bytes_left < sizeof(struct finfo))
(void) lfs_writeseg(fs, fs->lfs_sp);