diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-16 18:12:56 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-16 18:12:56 -0400 |
commit | a18f8775419d3df282dd83efdb51c5a64d092f31 (patch) | |
tree | 1e0abc5c1d30e8bc58dc23099017eca496992fd2 /fs/btrfs/tree-checker.c | |
parent | 3eb514866f20c5eb74637279774b6d73b855480a (diff) | |
parent | e02d48eaaed77f6c36916a7aa65c451e1f9d9aab (diff) |
Merge tag 'for-5.3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull btrfs updates from David Sterba:
"Highlights:
- chunks that have been trimmed and unchanged since last mount are
tracked and skipped on repeated trims
- use hw assissed crc32c on more arches, speedups if native
instructions or optimized implementation is available
- the RAID56 incompat bit is automatically removed when the last
block group of that type is removed
Fixes:
- fsync fix for reflink on NODATACOW files that could lead to ENOSPC
- fix data loss after inode eviction, renaming it, and fsync it
- fix fsync not persisting dentry deletions due to inode evictions
- update ctime/mtime/iversion after hole punching
- fix compression type validation (reported by KASAN)
- send won't be allowed to start when relocation is in progress, this
can cause spurious errors or produce incorrect send stream
Core:
- new tracepoints for space update
- tree-checker: better check for end of extents for some tree items
- preparatory work for more checksum algorithms
- run delayed iput at unlink time and don't push the work to cleaner
thread where it's not properly throttled
- wrap block mapping to structures and helpers, base for further
refactoring
- split large files, part 1:
- space info handling
- block group reservations
- delayed refs
- delayed allocation
- other cleanups and refactoring"
* tag 'for-5.3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux: (103 commits)
btrfs: fix memory leak of path on error return path
btrfs: move the subvolume reservation stuff out of extent-tree.c
btrfs: migrate the delalloc space stuff to it's own home
btrfs: migrate btrfs_trans_release_chunk_metadata
btrfs: migrate the delayed refs rsv code
btrfs: Evaluate io_tree in find_lock_delalloc_range()
btrfs: migrate the global_block_rsv helpers to block-rsv.c
btrfs: migrate the block-rsv code to block-rsv.c
btrfs: stop using block_rsv_release_bytes everywhere
btrfs: cleanup the target logic in __btrfs_block_rsv_release
btrfs: export __btrfs_block_rsv_release
btrfs: export btrfs_block_rsv_add_bytes
btrfs: move btrfs_block_rsv definitions into it's own header
btrfs: Simplify update of space_info in __reserve_metadata_bytes()
btrfs: unexport can_overcommit
btrfs: move reserve_metadata_bytes and supporting code to space-info.c
btrfs: move dump_space_info to space-info.c
btrfs: export block_rsv_use_bytes
btrfs: move btrfs_space_info_add_*_bytes to space-info.c
btrfs: move the space info update macro to space-info.h
...
Diffstat (limited to 'fs/btrfs/tree-checker.c')
-rw-r--r-- | fs/btrfs/tree-checker.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/fs/btrfs/tree-checker.c b/fs/btrfs/tree-checker.c index 96fce4bef4e7..ccd5706199d7 100644 --- a/fs/btrfs/tree-checker.c +++ b/fs/btrfs/tree-checker.c | |||
@@ -132,6 +132,7 @@ static int check_extent_data_item(struct extent_buffer *leaf, | |||
132 | struct btrfs_file_extent_item *fi; | 132 | struct btrfs_file_extent_item *fi; |
133 | u32 sectorsize = fs_info->sectorsize; | 133 | u32 sectorsize = fs_info->sectorsize; |
134 | u32 item_size = btrfs_item_size_nr(leaf, slot); | 134 | u32 item_size = btrfs_item_size_nr(leaf, slot); |
135 | u64 extent_end; | ||
135 | 136 | ||
136 | if (!IS_ALIGNED(key->offset, sectorsize)) { | 137 | if (!IS_ALIGNED(key->offset, sectorsize)) { |
137 | file_extent_err(leaf, slot, | 138 | file_extent_err(leaf, slot, |
@@ -207,6 +208,16 @@ static int check_extent_data_item(struct extent_buffer *leaf, | |||
207 | CHECK_FE_ALIGNED(leaf, slot, fi, num_bytes, sectorsize)) | 208 | CHECK_FE_ALIGNED(leaf, slot, fi, num_bytes, sectorsize)) |
208 | return -EUCLEAN; | 209 | return -EUCLEAN; |
209 | 210 | ||
211 | /* Catch extent end overflow */ | ||
212 | if (check_add_overflow(btrfs_file_extent_num_bytes(leaf, fi), | ||
213 | key->offset, &extent_end)) { | ||
214 | file_extent_err(leaf, slot, | ||
215 | "extent end overflow, have file offset %llu extent num bytes %llu", | ||
216 | key->offset, | ||
217 | btrfs_file_extent_num_bytes(leaf, fi)); | ||
218 | return -EUCLEAN; | ||
219 | } | ||
220 | |||
210 | /* | 221 | /* |
211 | * Check that no two consecutive file extent items, in the same leaf, | 222 | * Check that no two consecutive file extent items, in the same leaf, |
212 | * present ranges that overlap each other. | 223 | * present ranges that overlap each other. |