Correct panic messages.
Reviewed by: mckusick Sponsored by: The FreeBSD Foundation Approved by: re (rgrimes) MFC after: 1 week
This commit is contained in:
parent
108ff63e8a
commit
b7befdf509
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=338892
@ -10261,22 +10261,22 @@ initiate_write_inodeblock_ufs1(inodedep, bp)
|
||||
prevlbn = adp->ad_offset;
|
||||
if (adp->ad_offset < UFS_NDADDR &&
|
||||
dp->di_db[adp->ad_offset] != adp->ad_newblkno)
|
||||
panic("%s: direct pointer #%jd mismatch %d != %jd",
|
||||
"softdep_write_inodeblock",
|
||||
panic("initiate_write_inodeblock_ufs1: "
|
||||
"direct pointer #%jd mismatch %d != %jd",
|
||||
(intmax_t)adp->ad_offset,
|
||||
dp->di_db[adp->ad_offset],
|
||||
(intmax_t)adp->ad_newblkno);
|
||||
if (adp->ad_offset >= UFS_NDADDR &&
|
||||
dp->di_ib[adp->ad_offset - UFS_NDADDR] != adp->ad_newblkno)
|
||||
panic("%s: indirect pointer #%jd mismatch %d != %jd",
|
||||
"softdep_write_inodeblock",
|
||||
panic("initiate_write_inodeblock_ufs1: "
|
||||
"indirect pointer #%jd mismatch %d != %jd",
|
||||
(intmax_t)adp->ad_offset - UFS_NDADDR,
|
||||
dp->di_ib[adp->ad_offset - UFS_NDADDR],
|
||||
(intmax_t)adp->ad_newblkno);
|
||||
deplist |= 1 << adp->ad_offset;
|
||||
if ((adp->ad_state & ATTACHED) == 0)
|
||||
panic("softdep_write_inodeblock: Unknown state 0x%x",
|
||||
adp->ad_state);
|
||||
panic("initiate_write_inodeblock_ufs1: "
|
||||
"Unknown state 0x%x", adp->ad_state);
|
||||
#endif /* INVARIANTS */
|
||||
adp->ad_state &= ~ATTACHED;
|
||||
adp->ad_state |= UNDONE;
|
||||
@ -10299,7 +10299,8 @@ initiate_write_inodeblock_ufs1(inodedep, bp)
|
||||
for (i = adp->ad_offset + 1; i < UFS_NDADDR; i++) {
|
||||
#ifdef INVARIANTS
|
||||
if (dp->di_db[i] != 0 && (deplist & (1 << i)) == 0)
|
||||
panic("softdep_write_inodeblock: lost dep1");
|
||||
panic("initiate_write_inodeblock_ufs1: "
|
||||
"lost dep1");
|
||||
#endif /* INVARIANTS */
|
||||
dp->di_db[i] = 0;
|
||||
}
|
||||
@ -10307,7 +10308,8 @@ initiate_write_inodeblock_ufs1(inodedep, bp)
|
||||
#ifdef INVARIANTS
|
||||
if (dp->di_ib[i] != 0 &&
|
||||
(deplist & ((1 << UFS_NDADDR) << i)) == 0)
|
||||
panic("softdep_write_inodeblock: lost dep2");
|
||||
panic("initiate_write_inodeblock_ufs1: "
|
||||
"lost dep2");
|
||||
#endif /* INVARIANTS */
|
||||
dp->di_ib[i] = 0;
|
||||
}
|
||||
@ -10429,18 +10431,18 @@ initiate_write_inodeblock_ufs2(inodedep, bp)
|
||||
adp = TAILQ_NEXT(adp, ad_next)) {
|
||||
#ifdef INVARIANTS
|
||||
if (deplist != 0 && prevlbn >= adp->ad_offset)
|
||||
panic("softdep_write_inodeblock: lbn order");
|
||||
panic("initiate_write_inodeblock_ufs2: lbn order");
|
||||
prevlbn = adp->ad_offset;
|
||||
if (dp->di_extb[adp->ad_offset] != adp->ad_newblkno)
|
||||
panic("%s: direct pointer #%jd mismatch %jd != %jd",
|
||||
"softdep_write_inodeblock",
|
||||
panic("initiate_write_inodeblock_ufs2: "
|
||||
"ext pointer #%jd mismatch %jd != %jd",
|
||||
(intmax_t)adp->ad_offset,
|
||||
(intmax_t)dp->di_extb[adp->ad_offset],
|
||||
(intmax_t)adp->ad_newblkno);
|
||||
deplist |= 1 << adp->ad_offset;
|
||||
if ((adp->ad_state & ATTACHED) == 0)
|
||||
panic("softdep_write_inodeblock: Unknown state 0x%x",
|
||||
adp->ad_state);
|
||||
panic("initiate_write_inodeblock_ufs2: Unknown "
|
||||
"state 0x%x", adp->ad_state);
|
||||
#endif /* INVARIANTS */
|
||||
adp->ad_state &= ~ATTACHED;
|
||||
adp->ad_state |= UNDONE;
|
||||
@ -10461,7 +10463,8 @@ initiate_write_inodeblock_ufs2(inodedep, bp)
|
||||
for (i = adp->ad_offset + 1; i < UFS_NXADDR; i++) {
|
||||
#ifdef INVARIANTS
|
||||
if (dp->di_extb[i] != 0 && (deplist & (1 << i)) == 0)
|
||||
panic("softdep_write_inodeblock: lost dep1");
|
||||
panic("initiate_write_inodeblock_ufs2: "
|
||||
"lost dep1");
|
||||
#endif /* INVARIANTS */
|
||||
dp->di_extb[i] = 0;
|
||||
}
|
||||
@ -10494,22 +10497,22 @@ initiate_write_inodeblock_ufs2(inodedep, bp)
|
||||
prevlbn = adp->ad_offset;
|
||||
if (adp->ad_offset < UFS_NDADDR &&
|
||||
dp->di_db[adp->ad_offset] != adp->ad_newblkno)
|
||||
panic("%s: direct pointer #%jd mismatch %jd != %jd",
|
||||
"softdep_write_inodeblock",
|
||||
panic("initiate_write_inodeblock_ufs2: "
|
||||
"direct pointer #%jd mismatch %jd != %jd",
|
||||
(intmax_t)adp->ad_offset,
|
||||
(intmax_t)dp->di_db[adp->ad_offset],
|
||||
(intmax_t)adp->ad_newblkno);
|
||||
if (adp->ad_offset >= UFS_NDADDR &&
|
||||
dp->di_ib[adp->ad_offset - UFS_NDADDR] != adp->ad_newblkno)
|
||||
panic("%s indirect pointer #%jd mismatch %jd != %jd",
|
||||
"softdep_write_inodeblock:",
|
||||
panic("initiate_write_inodeblock_ufs2: "
|
||||
"indirect pointer #%jd mismatch %jd != %jd",
|
||||
(intmax_t)adp->ad_offset - UFS_NDADDR,
|
||||
(intmax_t)dp->di_ib[adp->ad_offset - UFS_NDADDR],
|
||||
(intmax_t)adp->ad_newblkno);
|
||||
deplist |= 1 << adp->ad_offset;
|
||||
if ((adp->ad_state & ATTACHED) == 0)
|
||||
panic("softdep_write_inodeblock: Unknown state 0x%x",
|
||||
adp->ad_state);
|
||||
panic("initiate_write_inodeblock_ufs2: Unknown "
|
||||
"state 0x%x", adp->ad_state);
|
||||
#endif /* INVARIANTS */
|
||||
adp->ad_state &= ~ATTACHED;
|
||||
adp->ad_state |= UNDONE;
|
||||
@ -10532,7 +10535,8 @@ initiate_write_inodeblock_ufs2(inodedep, bp)
|
||||
for (i = adp->ad_offset + 1; i < UFS_NDADDR; i++) {
|
||||
#ifdef INVARIANTS
|
||||
if (dp->di_db[i] != 0 && (deplist & (1 << i)) == 0)
|
||||
panic("softdep_write_inodeblock: lost dep2");
|
||||
panic("initiate_write_inodeblock_ufs2: "
|
||||
"lost dep2");
|
||||
#endif /* INVARIANTS */
|
||||
dp->di_db[i] = 0;
|
||||
}
|
||||
@ -10540,7 +10544,8 @@ initiate_write_inodeblock_ufs2(inodedep, bp)
|
||||
#ifdef INVARIANTS
|
||||
if (dp->di_ib[i] != 0 &&
|
||||
(deplist & ((1 << UFS_NDADDR) << i)) == 0)
|
||||
panic("softdep_write_inodeblock: lost dep3");
|
||||
panic("initiate_write_inodeblock_ufs2: "
|
||||
"lost dep3");
|
||||
#endif /* INVARIANTS */
|
||||
dp->di_ib[i] = 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user