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

btrfs: move split_flags/combine_flags helpers to inode-item.h 



These are more related to the inode item flags on disk than the
in-memory btrfs_inode, move the helpers to inode-item.h.

Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 2cac5af1

fs/btrfs/btrfs_inode.h

+0 −16
Original line number Diff line number Diff line
@@ -404,22 +404,6 @@ static inline bool btrfs_inode_can_compress(const struct btrfs_inode *inode) 
	return true;

}



/*

 * btrfs_inode_item stores flags in a u64, btrfs_inode stores them in two

 * separate u32s. These two functions convert between the two representations.

 */

static inline u64 btrfs_inode_combine_flags(u32 flags, u32 ro_flags)

{

	return (flags | ((u64)ro_flags << 32));

}



static inline void btrfs_inode_split_flags(u64 inode_item_flags,

					   u32 *flags, u32 *ro_flags)

{

	*flags = (u32)inode_item_flags;

	*ro_flags = (u32)(inode_item_flags >> 32);

}



/* Array of bytes with variable length, hexadecimal format 0x1234 */

#define CSUM_FMT				"0x%*phN"

#define CSUM_FMT_VALUE(size, bytes)		size, bytes

fs/btrfs/inode-item.h

+16 −0
Original line number Diff line number Diff line
@@ -60,6 +60,22 @@ struct btrfs_truncate_control { 
	bool clear_extent_range;

};



/*

 * btrfs_inode_item stores flags in a u64, btrfs_inode stores them in two

 * separate u32s. These two functions convert between the two representations.

 */

static inline u64 btrfs_inode_combine_flags(u32 flags, u32 ro_flags)

{

	return (flags | ((u64)ro_flags << 32));

}



static inline void btrfs_inode_split_flags(u64 inode_item_flags,

					   u32 *flags, u32 *ro_flags)

{

	*flags = (u32)inode_item_flags;

	*ro_flags = (u32)(inode_item_flags >> 32);

}



int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans,

			       struct btrfs_root *root,

			       struct btrfs_truncate_control *control);

fs/btrfs/tree-checker.c

+1 −1
Original line number Diff line number Diff line
@@ -25,10 +25,10 @@ 
#include "compression.h"

#include "volumes.h"

#include "misc.h"

#include "btrfs_inode.h"

#include "fs.h"

#include "accessors.h"

#include "file-item.h"

#include "inode-item.h"



/*

 * Error message should follow the following format: