GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-03-29 02:24:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

btrfs: open code trivial helper btrfs_page_exists_in_range

Browse source 
The called function name is self explanatory.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2018-03-07 15:33:22 +01:00
parent 965aab1cfc
commit 051c98eb11
3 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs/btrfs/btrfs_inode.h
View file

@ -364,10 +364,4 @@ static inline void btrfs_print_data_csum_error(struct btrfs_inode *inode,
logical_start, csum, csum_expected, mirror_num); logical_start, csum, csum_expected, mirror_num);
} }
static inline bool btrfs_page_exists_in_range(struct inode *inode,
loff_t start, loff_t end)
{
return filemap_range_has_page(inode->i_mapping, start, end);
}
#endif #endif

3
fs/btrfs/file.c
View file

@ -2482,7 +2482,8 @@ static int btrfs_punch_hole_lock_range(struct inode *inode,
if ((!ordered || if ((!ordered ||
(ordered->file_offset + ordered->len <= lockstart || (ordered->file_offset + ordered->len <= lockstart ||
ordered->file_offset > lockend)) && ordered->file_offset > lockend)) &&
!btrfs_page_exists_in_range(inode, lockstart, lockend)) { !filemap_range_has_page(inode->i_mapping,
lockstart, lockend)) {
if (ordered) if (ordered)
btrfs_put_ordered_extent(ordered); btrfs_put_ordered_extent(ordered);
break; break;

4
fs/btrfs/inode.c
View file

@ -7489,8 +7489,8 @@ static int lock_extent_direct(struct inode *inode, u64 lockstart, u64 lockend,
* get stale data. * get stale data.
*/ */
if (!ordered && if (!ordered &&
(!writing || (!writing || !filemap_range_has_page(inode->i_mapping,
!btrfs_page_exists_in_range(inode, lockstart, lockend))) lockstart, lockend)))
break; break;
unlock_extent_cached(&BTRFS_I(inode)->io_tree, lockstart, lockend, unlock_extent_cached(&BTRFS_I(inode)->io_tree, lockstart, lockend,