| Message ID | 92149e1c4fadff139a893282389e16f0a2f0da31.1633465964.git.josef@toxicpanda.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Miscellaneous error handling patches | expand |
On Tue, Oct 5, 2021 at 9:37 PM Josef Bacik <josef@toxicpanda.com> wrote: > > Error injection testing uncovered a case where we'd end up with a > corrupt file system with a missing extent in the middle of a file. This > occurs because the if statement to decide if we should abort is wrong. > The only way we would abort in this case is if we got a ret != > -EOPNOTSUPP and we called from the file clone code. However the > prealloc code uses this path too. Instead we need to abort if there is > an error, and the only error we _don't_ abort on is -EOPNOTSUPP and only > if we came from the clone file code. > > Signed-off-by: Josef Bacik <josef@toxicpanda.com> Reviewed-by: Filipe Manana <fdmanana@suse.com> Now it looks good, thanks. > --- > fs/btrfs/file.c | 16 +++++++++------- > 1 file changed, 9 insertions(+), 7 deletions(-) > > diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c > index 62673ad5f0ba..f908ef14d3a2 100644 > --- a/fs/btrfs/file.c > +++ b/fs/btrfs/file.c > @@ -2710,14 +2710,16 @@ int btrfs_replace_file_extents(struct btrfs_inode *inode, > drop_args.bytes_found); > if (ret != -ENOSPC) { > /* > - * When cloning we want to avoid transaction aborts when > - * nothing was done and we are attempting to clone parts > - * of inline extents, in such cases -EOPNOTSUPP is > - * returned by __btrfs_drop_extents() without having > - * changed anything in the file. > + * The only time we don't want to abort is if we are > + * attempting to clone a partial inline extent, in which > + * case we'll get EOPNOTSUPP. However if we aren't > + * clone we need to abort no matter what, because if we > + * got EOPNOTSUPP via prealloc then we messed up and > + * need to abort. > */ > - if (extent_info && !extent_info->is_new_extent && > - ret && ret != -EOPNOTSUPP) > + if (ret && > + (ret != -EOPNOTSUPP || > + (extent_info && extent_info->is_new_extent))) > btrfs_abort_transaction(trans, ret); > break; > } > -- > 2.26.3 >
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 62673ad5f0ba..f908ef14d3a2 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -2710,14 +2710,16 @@ int btrfs_replace_file_extents(struct btrfs_inode *inode, drop_args.bytes_found); if (ret != -ENOSPC) { /* - * When cloning we want to avoid transaction aborts when - * nothing was done and we are attempting to clone parts - * of inline extents, in such cases -EOPNOTSUPP is - * returned by __btrfs_drop_extents() without having - * changed anything in the file. + * The only time we don't want to abort is if we are + * attempting to clone a partial inline extent, in which + * case we'll get EOPNOTSUPP. However if we aren't + * clone we need to abort no matter what, because if we + * got EOPNOTSUPP via prealloc then we messed up and + * need to abort. */ - if (extent_info && !extent_info->is_new_extent && - ret && ret != -EOPNOTSUPP) + if (ret && + (ret != -EOPNOTSUPP || + (extent_info && extent_info->is_new_extent))) btrfs_abort_transaction(trans, ret); break; }
Error injection testing uncovered a case where we'd end up with a corrupt file system with a missing extent in the middle of a file. This occurs because the if statement to decide if we should abort is wrong. The only way we would abort in this case is if we got a ret != -EOPNOTSUPP and we called from the file clone code. However the prealloc code uses this path too. Instead we need to abort if there is an error, and the only error we _don't_ abort on is -EOPNOTSUPP and only if we came from the clone file code. Signed-off-by: Josef Bacik <josef@toxicpanda.com> --- fs/btrfs/file.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)