Commit ad1ac501 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

btrfs: move btrfs_map_token to accessors 



This is specific to the item-accessor code, move it out of ctree.h into
accessor.h/.c and then update the users to include the new header file.
This un-inlines btrfs_init_map_token, however this is only called once
per function so it's not critical to be inlined.  This also saves 904
bytes of code on a release build.

Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 818fe33a

fs/btrfs/accessors.c

+8 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <asm/unaligned.h>

#include "messages.h"

#include "ctree.h"

#include "accessors.h"



static bool check_setget_bounds(const struct extent_buffer *eb,

				const void *ptr, unsigned off, int size)
@@ -23,6 +24,13 @@ static bool check_setget_bounds(const struct extent_buffer *eb, 
	return true;

}



void btrfs_init_map_token(struct btrfs_map_token *token, struct extent_buffer *eb)

{

	token->eb = eb;

	token->kaddr = page_address(eb->pages[0]);

	token->offset = 0;

}



/*

 * Macro templates that define helpers to read/write extent buffer data of a

 * given size, that are also used via ctree.h for access to item members by

fs/btrfs/accessors.h

0 → 100644
+14 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */



#ifndef BTRFS_ACCESSORS_H

#define BTRFS_ACCESSORS_H



struct btrfs_map_token {

	struct extent_buffer *eb;

	char *kaddr;

	unsigned long offset;

};



void btrfs_init_map_token(struct btrfs_map_token *token, struct extent_buffer *eb);



#endif

fs/btrfs/ctree.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "tree-mod-log.h"

#include "tree-checker.h"

#include "fs.h"

#include "accessors.h"



static struct kmem_cache *btrfs_path_cachep;

fs/btrfs/ctree.h

+2 −14
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ struct btrfs_balance_control; 
struct btrfs_delayed_root;

struct reloc_control;



struct btrfs_map_token;



#define BTRFS_OLDEST_GENERATION	0ULL



#define BTRFS_EMPTY_DIR_SIZE 0
@@ -1199,23 +1201,9 @@ static inline u32 BTRFS_MAX_XATTR_SIZE(const struct btrfs_fs_info *info) 
	return BTRFS_MAX_ITEM_SIZE(info) - sizeof(struct btrfs_dir_item);

}



struct btrfs_map_token {

	struct extent_buffer *eb;

	char *kaddr;

	unsigned long offset;

};



#define BTRFS_BYTES_TO_BLKS(fs_info, bytes) \

				((bytes) >> (fs_info)->sectorsize_bits)



static inline void btrfs_init_map_token(struct btrfs_map_token *token,

					struct extent_buffer *eb)

{

	token->eb = eb;

	token->kaddr = page_address(eb->pages[0]);

	token->offset = 0;

}



/* some macros to generate set/get functions for the struct fields.  This

 * assumes there is a lefoo_to_cpu for every type, so lets make a simple

 * one for u8:

fs/btrfs/inode.c

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
#include "subpage.h"

#include "inode-item.h"

#include "fs.h"

#include "accessors.h"



struct btrfs_iget_args {

	u64 ino;