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

Commit ee22184b authored by Byongho Lee's avatar Byongho Lee Committed by David Sterba
Browse files

Btrfs: use linux/sizes.h to represent constants 



We use many constants to represent size and offset value.  And to make
code readable we use '256 * 1024 * 1024' instead of '268435456' to
represent '256MB'.  However we can make far more readable with 'SZ_256MB'
which is defined in the 'linux/sizes.h'.

So this patch replaces 'xxx * 1024 * 1024' kind of expression with
single 'SZ_xxxMB' if 'xxx' is a power of 2 then 'xxx * SZ_1M' if 'xxx' is
not a power of 2. And I haven't touched to '4096' & '8192' because it's
more intuitive than 'SZ_4KB' & 'SZ_8KB'.

Signed-off-by: default avatarByongho Lee <bhlee.kernel@gmail.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 7928d672

fs/btrfs/ctree.c

+1 −1
Original line number Diff line number Diff line
@@ -1555,7 +1555,7 @@ noinline int btrfs_cow_block(struct btrfs_trans_handle *trans, 
		return 0;

	}



	search_start = buf->start & ~((u64)(1024 * 1024 * 1024) - 1);

	search_start = buf->start & ~((u64)SZ_1G - 1);



	if (parent)

		btrfs_set_lock_blocking(parent);

fs/btrfs/ctree.h

+3 −2
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <linux/btrfs.h>

#include <linux/workqueue.h>

#include <linux/security.h>

#include <linux/sizes.h>

#include "extent_io.h"

#include "extent_map.h"

#include "async-thread.h"
@@ -196,9 +197,9 @@ static int btrfs_csum_sizes[] = { 4 }; 
/* ioprio of readahead is set to idle */

#define BTRFS_IOPRIO_READA (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_IDLE, 0))



#define BTRFS_DIRTY_METADATA_THRESH	(32 * 1024 * 1024)

#define BTRFS_DIRTY_METADATA_THRESH	SZ_32M



#define BTRFS_MAX_EXTENT_SIZE (128 * 1024 * 1024)

#define BTRFS_MAX_EXTENT_SIZE SZ_128M



/*

 * The key defines the order in the tree, and so it also defines (optimal)

fs/btrfs/disk-io.c

+1 −1
Original line number Diff line number Diff line
@@ -2809,7 +2809,7 @@ int open_ctree(struct super_block *sb, 


	fs_info->bdi.ra_pages *= btrfs_super_num_devices(disk_super);

	fs_info->bdi.ra_pages = max(fs_info->bdi.ra_pages,

				    4 * 1024 * 1024 / PAGE_CACHE_SIZE);

				    SZ_4M / PAGE_CACHE_SIZE);



	tree_root->nodesize = nodesize;

	tree_root->sectorsize = sectorsize;

fs/btrfs/disk-io.h

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#ifndef __DISKIO__

#define __DISKIO__



#define BTRFS_SUPER_INFO_OFFSET (64 * 1024)

#define BTRFS_SUPER_INFO_OFFSET SZ_64K

#define BTRFS_SUPER_INFO_SIZE 4096



#define BTRFS_SUPER_MIRROR_MAX	 3
@@ -35,7 +35,7 @@ enum btrfs_wq_endio_type { 


static inline u64 btrfs_sb_offset(int mirror)

{

	u64 start = 16 * 1024;

	u64 start = SZ_16K;

	if (mirror)

		return start << (BTRFS_SUPER_MIRROR_SHIFT * mirror);

	return BTRFS_SUPER_INFO_OFFSET;

fs/btrfs/extent-tree.c

+13 −16
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ static noinline void caching_thread(struct btrfs_work *work) 
			else

				last = key.objectid + key.offset;



			if (total_found > (1024 * 1024 * 2)) {

			if (total_found > SZ_2M) {

				total_found = 0;

				if (wakeup)

					wake_up(&caching_ctl->wait);
@@ -3328,7 +3328,7 @@ static int cache_save_setup(struct btrfs_block_group_cache *block_group, 
	 * If this block group is smaller than 100 megs don't bother caching the

	 * block group.

	 */

	if (block_group->key.offset < (100 * 1024 * 1024)) {

	if (block_group->key.offset < (100 * SZ_1M)) {

		spin_lock(&block_group->lock);

		block_group->disk_cache_state = BTRFS_DC_WRITTEN;

		spin_unlock(&block_group->lock);
@@ -3428,7 +3428,7 @@ static int cache_save_setup(struct btrfs_block_group_cache *block_group, 
	 * taking up quite a bit since it's not folded into the other space

	 * cache.

	 */

	num_pages = div_u64(block_group->key.offset, 256 * 1024 * 1024);

	num_pages = div_u64(block_group->key.offset, SZ_256M);

	if (!num_pages)

		num_pages = 1;
@@ -4239,14 +4239,13 @@ static int should_alloc_chunk(struct btrfs_root *root, 
	 */

	if (force == CHUNK_ALLOC_LIMITED) {

		thresh = btrfs_super_total_bytes(root->fs_info->super_copy);

		thresh = max_t(u64, 64 * 1024 * 1024,

			       div_factor_fine(thresh, 1));

		thresh = max_t(u64, SZ_64M, div_factor_fine(thresh, 1));



		if (num_bytes - num_allocated < thresh)

			return 1;

	}



	if (num_allocated + 2 * 1024 * 1024 < div_factor(num_bytes, 8))

	if (num_allocated + SZ_2M < div_factor(num_bytes, 8))

		return 0;

	return 1;

}
@@ -4446,7 +4445,7 @@ static int do_chunk_alloc(struct btrfs_trans_handle *trans, 
	 * transaction.

	 */

	if (trans->can_flush_pending_bgs &&

	    trans->chunk_bytes_reserved >= (2 * 1024 * 1024ull)) {

	    trans->chunk_bytes_reserved >= (u64)SZ_2M) {

		btrfs_create_pending_block_groups(trans, trans->root);

		btrfs_trans_release_chunk_metadata(trans);

	}
@@ -4544,7 +4543,7 @@ static inline int calc_reclaim_items_nr(struct btrfs_root *root, u64 to_reclaim) 
	return nr;

}



#define EXTENT_SIZE_PER_ITEM	(256 * 1024)

#define EXTENT_SIZE_PER_ITEM	SZ_256K



/*

 * shrink metadata reservation for delalloc
@@ -4749,8 +4748,7 @@ btrfs_calc_reclaim_metadata_size(struct btrfs_root *root, 
	u64 expected;

	u64 to_reclaim;



	to_reclaim = min_t(u64, num_online_cpus() * 1024 * 1024,

				16 * 1024 * 1024);

	to_reclaim = min_t(u64, num_online_cpus() * SZ_1M, SZ_16M);

	spin_lock(&space_info->lock);

	if (can_overcommit(root, space_info, to_reclaim,

			   BTRFS_RESERVE_FLUSH_ALL)) {
@@ -4761,8 +4759,7 @@ btrfs_calc_reclaim_metadata_size(struct btrfs_root *root, 
	used = space_info->bytes_used + space_info->bytes_reserved +

	       space_info->bytes_pinned + space_info->bytes_readonly +

	       space_info->bytes_may_use;

	if (can_overcommit(root, space_info, 1024 * 1024,

			   BTRFS_RESERVE_FLUSH_ALL))

	if (can_overcommit(root, space_info, SZ_1M, BTRFS_RESERVE_FLUSH_ALL))

		expected = div_factor_fine(space_info->total_bytes, 95);

	else

		expected = div_factor_fine(space_info->total_bytes, 90);
@@ -5318,7 +5315,7 @@ static void update_global_block_rsv(struct btrfs_fs_info *fs_info) 
	spin_lock(&sinfo->lock);

	spin_lock(&block_rsv->lock);



	block_rsv->size = min_t(u64, num_bytes, 512 * 1024 * 1024);

	block_rsv->size = min_t(u64, num_bytes, SZ_512M);



	num_bytes = sinfo->bytes_used + sinfo->bytes_pinned +

		    sinfo->bytes_reserved + sinfo->bytes_readonly +
@@ -6222,11 +6219,11 @@ fetch_cluster_info(struct btrfs_root *root, struct btrfs_space_info *space_info, 
		return ret;



	if (ssd)

		*empty_cluster = 2 * 1024 * 1024;

		*empty_cluster = SZ_2M;

	if (space_info->flags & BTRFS_BLOCK_GROUP_METADATA) {

		ret = &root->fs_info->meta_alloc_cluster;

		if (!ssd)

			*empty_cluster = 64 * 1024;

			*empty_cluster = SZ_64K;

	} else if ((space_info->flags & BTRFS_BLOCK_GROUP_DATA) && ssd) {

		ret = &root->fs_info->data_alloc_cluster;

	}
@@ -9124,7 +9121,7 @@ static int inc_block_group_ro(struct btrfs_block_group_cache *cache, int force) 
	if ((sinfo->flags &

	     (BTRFS_BLOCK_GROUP_SYSTEM | BTRFS_BLOCK_GROUP_METADATA)) &&

	    !force)

		min_allocable_bytes = 1 * 1024 * 1024;

		min_allocable_bytes = SZ_1M;

	else

		min_allocable_bytes = 0;