| Message ID | 1526405857-88702-2-git-send-email-bo.liu@linux.alibaba.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, May 16, 2018 at 01:37:37AM +0800, Liu Bo wrote: > @parent_transid could tell whether the eb's generation has been verified > by the caller. Can you please write why you add this change? Like is it an enhancement or debugging help or someting like that. -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 2018年05月16日 01:37, Liu Bo wrote: > @parent_transid could tell whether the eb's generation has been verified > by the caller. > > Signed-off-by: Liu Bo <bo.liu@linux.alibaba.com> Looks pretty useful to debug the btrfs/124 bug you just fixed. But a small nitpick inlined below: > --- > fs/btrfs/disk-io.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c > index 60caa68c3618..b5d55b0ec19b 100644 > --- a/fs/btrfs/disk-io.c > +++ b/fs/btrfs/disk-io.c > @@ -416,7 +416,7 @@ static int btrfs_check_super_csum(struct btrfs_fs_info *fs_info, > > static int verify_level_key(struct btrfs_fs_info *fs_info, > struct extent_buffer *eb, int level, > - struct btrfs_key *first_key) > + struct btrfs_key *first_key, u64 parent_transid) > { > int found_level; > struct btrfs_key found_key; > @@ -454,10 +454,10 @@ static int verify_level_key(struct btrfs_fs_info *fs_info, > if (ret) { > WARN_ON(1); > btrfs_err(fs_info, > -"tree first key mismatch detected, bytenr=%llu key expected=(%llu, %u, %llu) has=(%llu, %u, %llu)", > +"tree first key mismatch detected, bytenr=%llu key expected=(%llu, %u, %llu) has=(%llu, %u, %llu) parent_transid %llu", It would look better if parent transid can be before key output. Despite that, everything looks good. Thanks, Qu > eb->start, first_key->objectid, first_key->type, > first_key->offset, found_key.objectid, > - found_key.type, found_key.offset); > + found_key.type, found_key.offset, parent_transid); > } > #endif > return ret; > @@ -493,7 +493,7 @@ static int btree_read_extent_buffer_pages(struct btrfs_fs_info *fs_info, > parent_transid, 0)) > ret = -EIO; > else if (verify_level_key(fs_info, eb, level, > - first_key)) > + first_key, parent_transid)) > ret = -EUCLEAN; > else > break; >
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 60caa68c3618..b5d55b0ec19b 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -416,7 +416,7 @@ static int btrfs_check_super_csum(struct btrfs_fs_info *fs_info, static int verify_level_key(struct btrfs_fs_info *fs_info, struct extent_buffer *eb, int level, - struct btrfs_key *first_key) + struct btrfs_key *first_key, u64 parent_transid) { int found_level; struct btrfs_key found_key; @@ -454,10 +454,10 @@ static int verify_level_key(struct btrfs_fs_info *fs_info, if (ret) { WARN_ON(1); btrfs_err(fs_info, -"tree first key mismatch detected, bytenr=%llu key expected=(%llu, %u, %llu) has=(%llu, %u, %llu)", +"tree first key mismatch detected, bytenr=%llu key expected=(%llu, %u, %llu) has=(%llu, %u, %llu) parent_transid %llu", eb->start, first_key->objectid, first_key->type, first_key->offset, found_key.objectid, - found_key.type, found_key.offset); + found_key.type, found_key.offset, parent_transid); } #endif return ret; @@ -493,7 +493,7 @@ static int btree_read_extent_buffer_pages(struct btrfs_fs_info *fs_info, parent_transid, 0)) ret = -EIO; else if (verify_level_key(fs_info, eb, level, - first_key)) + first_key, parent_transid)) ret = -EUCLEAN; else break;
@parent_transid could tell whether the eb's generation has been verified by the caller. Signed-off-by: Liu Bo <bo.liu@linux.alibaba.com> --- fs/btrfs/disk-io.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)