diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2021-06-23 05:43:45 -0400 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-06-23 07:30:41 -0400 |
commit | c3ab0e28a437c213e5e2c1d890f3891b6952b9ca (patch) | |
tree | 8246e6614acd941b07c0925dea03b97f3ae1f3a7 /fs/btrfs/ordered-data.c | |
parent | ba1f82456ba8438a8abc96274d57bfe76d34a4a8 (diff) | |
parent | 51696f39cbee5bb684e7959c0c98b5f54548aa34 (diff) |
Merge branch 'topic/ppc-kvm' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux into HEAD
- Support for the H_RPT_INVALIDATE hypercall
- Conversion of Book3S entry/exit to C
- Bug fixes
Diffstat (limited to 'fs/btrfs/ordered-data.c')
-rw-r--r-- | fs/btrfs/ordered-data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c index 07b0b4218791..6c413bb451a3 100644 --- a/fs/btrfs/ordered-data.c +++ b/fs/btrfs/ordered-data.c @@ -984,7 +984,7 @@ int btrfs_split_ordered_extent(struct btrfs_ordered_extent *ordered, u64 pre, if (pre) ret = clone_ordered_extent(ordered, 0, pre); - if (post) + if (ret == 0 && post) ret = clone_ordered_extent(ordered, pre + ordered->disk_num_bytes, post); |