mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-02 12:20:51 +00:00
Code Issues Releases Activity

- blk_equals() is too strict. If the journal entry defines more frags

Browse Source 
than we're claiming it should still be considered an exact match.  This
   would previously leak frags that had been extended.
 - If there is a sequence number problem in the journal print the sequence
   numbers we've seen so far for debugging.
 - Clean up the block mask related debuging printfs.  Some are redundant.

MFC after:	1 week
This commit is contained in:
Jeff Roberson 2012-11-14 06:31:47 +00:00
parent d7bf9fd625
commit 2db62a6b1f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=243017
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sbin/fsck_ffs/suj.c
View File

@ -504,7 +504,7 @@ blk_equals(struct jblkrec *brec, ino_t ino, ufs_lbn_t lbn, ufs2_daddr_t start,
return (0);
if (brec->jb_blkno + brec->jb_oldfrags != start)
return (0);
if (brec->jb_frags != frags)
if (brec->jb_frags < frags)
return (0);
return (1);
}
@ -551,7 +551,6 @@ blk_freemask(ufs2_daddr_t blk, ino_t ino, ufs_lbn_t lbn, int frags)
brec = (struct jblkrec *)srec->sr_rec;
/*
* If the block overlaps but does not match
* exactly it's a new allocation. If it matches
* exactly this record refers to the current
* location.
*/
@ -648,7 +647,8 @@ blk_free(ufs2_daddr_t bno, int mask, int frags)
uint8_t *blksfree;
if (debug)
printf("Freeing %d frags at blk %jd\n", frags, bno);
printf("Freeing %d frags at blk %jd mask 0x%x\n",
frags, bno, mask);
cg = dtog(fs, bno);
sc = cg_lookup(cg);
cgp = sc->sc_cgp;
@ -1143,12 +1143,8 @@ ino_adjblks(struct suj_ino *sino)
static void
blk_free_visit(ino_t ino, ufs_lbn_t lbn, ufs2_daddr_t blk, int frags)
{
int mask;
mask = blk_freemask(blk, ino, lbn, frags);
if (debug)
printf("blk %jd freemask 0x%X\n", blk, mask);
blk_free(blk, mask, frags);
blk_free(blk, blk_freemask(blk, ino, lbn, frags), frags);
}
/*
@ -1163,8 +1159,6 @@ blk_free_lbn(ufs2_daddr_t blk, ino_t ino, ufs_lbn_t lbn, int frags, int follow)
int mask;
mask = blk_freemask(blk, ino, lbn, frags);
if (debug)
printf("blk %jd freemask 0x%X\n", blk, mask);
resid = 0;
if (lbn <= -NDADDR && follow && mask == 0)
indir_visit(ino, lbn, blk, &resid, blk_free_visit, VISIT_INDIR);
@ -2334,6 +2328,10 @@ suj_prune(void)
}
if (newseq != oldseq) {
TAILQ_FOREACH(seg, &allsegs, ss_next) {
printf("%jd, ", seg->ss_rec.jsr_seq);
}
printf("\n");
err_suj("Journal file sequence mismatch %jd != %jd\n",
newseq, oldseq);
}