Commit a416637f authored by Qu Wenruo's avatar Qu Wenruo Committed by David Sterba
Browse files

btrfs: replace PAGE_SIZE with folio_size for subpage.[ch] 



Since we can no longer assume all data filemap folios are page sized,
use proper folio_size() calls to determine the folio size, as a
preparation for future large data filemap folios.

Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarQu Wenruo <wqu@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent cb3c11d2

fs/btrfs/subpage.c

+3 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#include "btrfs_inode.h"



/*

 * Subpage (sectorsize < PAGE_SIZE) support overview:

 * Subpage (block size < folio size) support overview:

 *

 * Limitations:

 *
@@ -194,7 +194,7 @@ static void btrfs_subpage_assert(const struct btrfs_fs_info *fs_info, 
	 */

	if (folio->mapping)

		ASSERT(folio_pos(folio) <= start &&

		       start + len <= folio_pos(folio) + PAGE_SIZE);

		       start + len <= folio_pos(folio) + folio_size(folio));

}



#define subpage_calc_start_bit(fs_info, folio, name, start, len)	\
@@ -223,7 +223,7 @@ static void btrfs_subpage_clamp_range(struct folio *folio, u64 *start, u32 *len) 
	if (folio_pos(folio) >= orig_start + orig_len)

		*len = 0;

	else

		*len = min_t(u64, folio_pos(folio) + PAGE_SIZE,

		*len = min_t(u64, folio_pos(folio) + folio_size(folio),

			     orig_start + orig_len) - *start;

}

fs/btrfs/subpage.h

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static inline bool btrfs_is_subpage(const struct btrfs_fs_info *fs_info, 
{

	if (folio->mapping && folio->mapping->host)

		ASSERT(is_data_inode(BTRFS_I(folio->mapping->host)));

	return fs_info->sectorsize < PAGE_SIZE;

	return fs_info->sectorsize < folio_size(folio);

}

#else

static inline bool btrfs_meta_is_subpage(const struct btrfs_fs_info *fs_info)