diff options
| author | Darrick J. Wong <djwong@kernel.org> | 2023-08-29 16:03:43 -0700 |
|---|---|---|
| committer | Zorro Lang <zlang@kernel.org> | 2023-09-02 13:54:38 +0800 |
| commit | 225170dbbc688b36a57bf4fd3eb67ef6e5705f28 (patch) | |
| tree | 18662259f4c09ff9507fef53c5d864381fef445b /common | |
| parent | bfe2fd60049e91334ce559309c24e1543a2031f7 (diff) | |
common: rename get_page_size to _get_page_size
This function does not follow the naming convention that common helpers
must start with an underscore. Fix this.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Zorro Lang <zlang@redhat.com>
Signed-off-by: Zorro Lang <zlang@kernel.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/btrfs | 2 | ||||
| -rw-r--r-- | common/filter | 2 | ||||
| -rw-r--r-- | common/rc | 6 | ||||
| -rw-r--r-- | common/verity | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/common/btrfs b/common/btrfs index 0fec093d..c9903a41 100644 --- a/common/btrfs +++ b/common/btrfs @@ -489,7 +489,7 @@ _require_btrfs_support_sectorsize() local sectorsize=$1 # PAGE_SIZE as sectorsize is always supported - if [ $sectorsize -eq $(get_page_size) ]; then + if [ $sectorsize -eq $(_get_page_size) ]; then return fi diff --git a/common/filter b/common/filter index f10ba78a..509ee950 100644 --- a/common/filter +++ b/common/filter @@ -228,7 +228,7 @@ _filter_xfs_io_blocks_modified() _filter_xfs_io_pages_modified() { - PAGE_SIZE=$(get_page_size) + PAGE_SIZE=$(_get_page_size) _filter_xfs_io_units_modified "Page" $PAGE_SIZE } @@ -1100,7 +1100,7 @@ _scratch_mkfs_blocksized() if ! [[ $blocksize =~ $re ]] ; then _notrun "error: _scratch_mkfs_sized: block size \"$blocksize\" not an integer." fi - if [ $blocksize -lt $(get_page_size) ]; then + if [ $blocksize -lt $(_get_page_size) ]; then _exclude_scratch_mount_option dax fi @@ -2808,7 +2808,7 @@ _require_scratch_swapfile() _scratch_mount # Minimum size for mkswap is 10 pages - _format_swapfile "$SCRATCH_MNT/swap" $(($(get_page_size) * 10)) > /dev/null + _format_swapfile "$SCRATCH_MNT/swap" $(($(_get_page_size) * 10)) > /dev/null # ext* has supported all variants of swap files since their # introduction, so swapon should not fail. @@ -4667,7 +4667,7 @@ _require_file_block_size_equals_fs_block_size() _notrun "File allocation unit is larger than a filesystem block" } -get_page_size() +_get_page_size() { echo $(getconf PAGE_SIZE) } diff --git a/common/verity b/common/verity index e0937717..03d175ce 100644 --- a/common/verity +++ b/common/verity @@ -61,7 +61,7 @@ _require_scratch_verity() # Therefore, we default to merkle_tree_block_size == min(fs_block_size, # page_size). That maximizes the chance of verity actually working. local fs_block_size=$(_get_block_size $scratch_mnt) - local page_size=$(get_page_size) + local page_size=$(_get_page_size) if (( fs_block_size <= page_size )); then FSV_BLOCK_SIZE=$fs_block_size else |