| Message ID | 20180301024747.26192-3-wqu@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 03/01/2018 10:47 AM, Qu Wenruo wrote: > Kernel doesn't allow inline extent equal or larger than 4K. > And for inline extent larger than 4K, __btrfs_drop_extents() can return > -EOPNOTSUPP and cause unexpected error. > > Check it in original mode. > > Signed-off-by: Qu Wenruo <wqu@suse.com> Looks good to me. Reviewed-by: Su Yue <suy.fnst@cn.fujitsu.com> > --- > check/main.c | 4 ++++ > check/mode-original.h | 1 + > 2 files changed, 5 insertions(+) > > diff --git a/check/main.c b/check/main.c > index 97baae583f04..ce41550ab16a 100644 > --- a/check/main.c > +++ b/check/main.c > @@ -560,6 +560,8 @@ static void print_inode_error(struct btrfs_root *root, struct inode_record *rec) > fprintf(stderr, ", bad file extent"); > if (errors & I_ERR_FILE_EXTENT_OVERLAP) > fprintf(stderr, ", file extent overlap"); > + if (errors & I_ERR_FILE_EXTENT_TOO_LARGE) > + fprintf(stderr, ", inline file extent too large"); > if (errors & I_ERR_FILE_EXTENT_DISCOUNT) > fprintf(stderr, ", file extent discount"); > if (errors & I_ERR_DIR_ISIZE_WRONG) > @@ -1461,6 +1463,8 @@ static int process_file_extent(struct btrfs_root *root, > num_bytes = btrfs_file_extent_inline_len(eb, slot, fi); > if (num_bytes == 0) > rec->errors |= I_ERR_BAD_FILE_EXTENT; > + if (num_bytes > BTRFS_MAX_INLINE_DATA_SIZE(root->fs_info)) > + rec->errors |= I_ERR_FILE_EXTENT_TOO_LARGE; > rec->found_size += num_bytes; > num_bytes = (num_bytes + mask) & ~mask; > } else if (extent_type == BTRFS_FILE_EXTENT_REG || > diff --git a/check/mode-original.h b/check/mode-original.h > index f859af478f0f..368de692fdd1 100644 > --- a/check/mode-original.h > +++ b/check/mode-original.h > @@ -185,6 +185,7 @@ struct file_extent_hole { > #define I_ERR_SOME_CSUM_MISSING (1 << 12) > #define I_ERR_LINK_COUNT_WRONG (1 << 13) > #define I_ERR_FILE_EXTENT_ORPHAN (1 << 14) > +#define I_ERR_FILE_EXTENT_TOO_LARGE (1 << 15) > > struct inode_record { > struct list_head backrefs; > -- 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
diff --git a/check/main.c b/check/main.c index 97baae583f04..ce41550ab16a 100644 --- a/check/main.c +++ b/check/main.c @@ -560,6 +560,8 @@ static void print_inode_error(struct btrfs_root *root, struct inode_record *rec) fprintf(stderr, ", bad file extent"); if (errors & I_ERR_FILE_EXTENT_OVERLAP) fprintf(stderr, ", file extent overlap"); + if (errors & I_ERR_FILE_EXTENT_TOO_LARGE) + fprintf(stderr, ", inline file extent too large"); if (errors & I_ERR_FILE_EXTENT_DISCOUNT) fprintf(stderr, ", file extent discount"); if (errors & I_ERR_DIR_ISIZE_WRONG) @@ -1461,6 +1463,8 @@ static int process_file_extent(struct btrfs_root *root, num_bytes = btrfs_file_extent_inline_len(eb, slot, fi); if (num_bytes == 0) rec->errors |= I_ERR_BAD_FILE_EXTENT; + if (num_bytes > BTRFS_MAX_INLINE_DATA_SIZE(root->fs_info)) + rec->errors |= I_ERR_FILE_EXTENT_TOO_LARGE; rec->found_size += num_bytes; num_bytes = (num_bytes + mask) & ~mask; } else if (extent_type == BTRFS_FILE_EXTENT_REG || diff --git a/check/mode-original.h b/check/mode-original.h index f859af478f0f..368de692fdd1 100644 --- a/check/mode-original.h +++ b/check/mode-original.h @@ -185,6 +185,7 @@ struct file_extent_hole { #define I_ERR_SOME_CSUM_MISSING (1 << 12) #define I_ERR_LINK_COUNT_WRONG (1 << 13) #define I_ERR_FILE_EXTENT_ORPHAN (1 << 14) +#define I_ERR_FILE_EXTENT_TOO_LARGE (1 << 15) struct inode_record { struct list_head backrefs;
Kernel doesn't allow inline extent equal or larger than 4K. And for inline extent larger than 4K, __btrfs_drop_extents() can return -EOPNOTSUPP and cause unexpected error. Check it in original mode. Signed-off-by: Qu Wenruo <wqu@suse.com> --- check/main.c | 4 ++++ check/mode-original.h | 1 + 2 files changed, 5 insertions(+)