| Message ID | 148494394775.5256.15878832693432189642.stgit@birch.djwong.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On 1/20/17 2:25 PM, Darrick J. Wong wrote: > If xfs_repair detects a dir/attr btree that cycles back to the root, the > tree should be cleared and/or rebuilt instead of simply aborting the > repair program. > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> So, while this seems ok, so: Reviewed-by: Eric Sandeen <sandeen@redhat.com> you can take this or leave it: It'd be a bit nicer to just test da_bno outside the loop, I think; the whole loop is do { .... } while (da_bno != 0); so the only way da_bno can be zero here is if we entered the loop this way after: da_bno = da_cursor->level[0].bno; prior to entering it the first time: ino = da_cursor->ino; prev_bno = 0; do { -Eric > --- > repair/attr_repair.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > > diff --git a/repair/attr_repair.c b/repair/attr_repair.c > index b855a10..37a821b 100644 > --- a/repair/attr_repair.c > +++ b/repair/attr_repair.c > @@ -763,7 +763,12 @@ process_leaf_attr_level(xfs_mount_t *mp, > * 0 is the root block and no block > * pointer can point to the root block of the btree > */ > - ASSERT(da_bno != 0); > + if (da_bno == 0) { > + do_warn( > + _("btree cycle detected in attribute fork for inode %" PRIu64 "\n"), > + ino); > + goto error_out; > + } > > if (dev_bno == NULLFSBLOCK) { > do_warn( > > -- > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/repair/attr_repair.c b/repair/attr_repair.c index b855a10..37a821b 100644 --- a/repair/attr_repair.c +++ b/repair/attr_repair.c @@ -763,7 +763,12 @@ process_leaf_attr_level(xfs_mount_t *mp, * 0 is the root block and no block * pointer can point to the root block of the btree */ - ASSERT(da_bno != 0); + if (da_bno == 0) { + do_warn( + _("btree cycle detected in attribute fork for inode %" PRIu64 "\n"), + ino); + goto error_out; + } if (dev_bno == NULLFSBLOCK) { do_warn(
If xfs_repair detects a dir/attr btree that cycles back to the root, the tree should be cleared and/or rebuilt instead of simply aborting the repair program. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> --- repair/attr_repair.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html