Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 051c98eb authored by David Sterba's avatar David Sterba
Browse files

btrfs: open code trivial helper btrfs_page_exists_in_range 



The called function name is self explanatory.

Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 965aab1c

fs/btrfs/btrfs_inode.h

+0 −6
Original line number Diff line number Diff line
@@ -364,10 +364,4 @@ static inline void btrfs_print_data_csum_error(struct btrfs_inode *inode, 
			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

fs/btrfs/file.c

+2 −1
Original line number Diff line number Diff line
@@ -2482,7 +2482,8 @@ static int btrfs_punch_hole_lock_range(struct inode *inode, 
		if ((!ordered ||

		    (ordered->file_offset + ordered->len <= lockstart ||

		     ordered->file_offset > lockend)) &&

		     !btrfs_page_exists_in_range(inode, lockstart, lockend)) {

		     !filemap_range_has_page(inode->i_mapping,

					     lockstart, lockend)) {

			if (ordered)

				btrfs_put_ordered_extent(ordered);

			break;

fs/btrfs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -7489,8 +7489,8 @@ static int lock_extent_direct(struct inode *inode, u64 lockstart, u64 lockend, 
		 * get stale data.

		 */

		if (!ordered &&

		    (!writing ||

		     !btrfs_page_exists_in_range(inode, lockstart, lockend)))

		    (!writing || !filemap_range_has_page(inode->i_mapping,

							 lockstart, lockend)))

			break;



		unlock_extent_cached(&BTRFS_I(inode)->io_tree, lockstart, lockend,