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

btrfs: move file_extent_item helpers into file-item.h 



These helpers use functions that are in multiple places, which makes it
tricky to sync them into btrfs-progs.  Move them to file-item.h and then
include file-item.h in places that use these helpers.

Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 3a3178c7

fs/btrfs/accessors.h

+0 −22
Original line number Diff line number Diff line
@@ -915,16 +915,6 @@ BTRFS_SETGET_STACK_FUNCS(stack_file_extent_disk_num_bytes, 
BTRFS_SETGET_STACK_FUNCS(stack_file_extent_compression,

			 struct btrfs_file_extent_item, compression, 8);



static inline unsigned long btrfs_file_extent_inline_start(

				const struct btrfs_file_extent_item *e)

{

	return (unsigned long)e + BTRFS_FILE_EXTENT_INLINE_DATA_START;

}



static inline u32 btrfs_file_extent_calc_inline_size(u32 datasize)

{

	return BTRFS_FILE_EXTENT_INLINE_DATA_START + datasize;

}



BTRFS_SETGET_FUNCS(file_extent_type, struct btrfs_file_extent_item, type, 8);

BTRFS_SETGET_FUNCS(file_extent_disk_bytenr, struct btrfs_file_extent_item,
@@ -946,18 +936,6 @@ BTRFS_SETGET_FUNCS(file_extent_encryption, struct btrfs_file_extent_item, 
BTRFS_SETGET_FUNCS(file_extent_other_encoding, struct btrfs_file_extent_item,

		   other_encoding, 16);



/*

 * Returns the number of bytes used by the item on disk, minus the size of any

 * extent headers.  If a file is compressed on disk, this is the compressed

 * size.

 */

static inline u32 btrfs_file_extent_inline_item_len(

						const struct extent_buffer *eb,

						int nr)

{

	return btrfs_item_size(eb, nr) - BTRFS_FILE_EXTENT_INLINE_DATA_START;

}



/* btrfs_qgroup_status_item */

BTRFS_SETGET_FUNCS(qgroup_status_generation, struct btrfs_qgroup_status_item,

		   generation, 64);

fs/btrfs/ctree.c

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

#include "extent-tree.h"

#include "relocation.h"

#include "file-item.h"



static struct kmem_cache *btrfs_path_cachep;

fs/btrfs/ctree.h

+0 −8
Original line number Diff line number Diff line
@@ -461,14 +461,6 @@ static inline u32 BTRFS_NODEPTRS_PER_BLOCK(const struct btrfs_fs_info *info) 
	return BTRFS_LEAF_DATA_SIZE(info) / sizeof(struct btrfs_key_ptr);

}



#define BTRFS_FILE_EXTENT_INLINE_DATA_START		\

		(offsetof(struct btrfs_file_extent_item, disk_bytenr))

static inline u32 BTRFS_MAX_INLINE_DATA_SIZE(const struct btrfs_fs_info *info)

{

	return BTRFS_MAX_ITEM_SIZE(info) -

	       BTRFS_FILE_EXTENT_INLINE_DATA_START;

}



static inline u32 BTRFS_MAX_XATTR_SIZE(const struct btrfs_fs_info *info)

{

	return BTRFS_MAX_ITEM_SIZE(info) - sizeof(struct btrfs_dir_item);

fs/btrfs/file-item.h

+33 −0
Original line number Diff line number Diff line
@@ -3,6 +3,39 @@ 
#ifndef BTRFS_FILE_ITEM_H

#define BTRFS_FILE_ITEM_H



#include "accessors.h"



#define BTRFS_FILE_EXTENT_INLINE_DATA_START		\

		(offsetof(struct btrfs_file_extent_item, disk_bytenr))



static inline u32 BTRFS_MAX_INLINE_DATA_SIZE(const struct btrfs_fs_info *info)

{

	return BTRFS_MAX_ITEM_SIZE(info) - BTRFS_FILE_EXTENT_INLINE_DATA_START;

}



/*

 * Return the number of bytes used by the item on disk, minus the size of any

 * extent headers.  If a file is compressed on disk, this is the compressed

 * size.

 */

static inline u32 btrfs_file_extent_inline_item_len(

						const struct extent_buffer *eb,

						int nr)

{

	return btrfs_item_size(eb, nr) - BTRFS_FILE_EXTENT_INLINE_DATA_START;

}



static inline unsigned long btrfs_file_extent_inline_start(

				const struct btrfs_file_extent_item *e)

{

	return (unsigned long)e + BTRFS_FILE_EXTENT_INLINE_DATA_START;

}



static inline u32 btrfs_file_extent_calc_inline_size(u32 datasize)

{

	return BTRFS_FILE_EXTENT_INLINE_DATA_START + datasize;

}



int btrfs_del_csums(struct btrfs_trans_handle *trans,

		    struct btrfs_root *root, u64 bytenr, u64 len);

blk_status_t btrfs_lookup_bio_sums(struct inode *inode, struct bio *bio, u8 *dst);

fs/btrfs/tree-checker.c

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

#include "fs.h"

#include "accessors.h"

#include "file-item.h"



/*

 * Error message should follow the following format: