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

btrfs: move the btrfs_verity_descriptor_item defs up in ctree.h 



These are wrapped in CONFIG_FS_VERITY, but we can have the definitions
without verity enabled.  Move these definitions up with the other
accessor helpers.

Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.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 890d2b1a

fs/btrfs/ctree.h

+10 −9
Original line number Diff line number Diff line
@@ -2523,6 +2523,16 @@ BTRFS_SETGET_STACK_FUNCS(stack_dev_replace_cursor_left, 
BTRFS_SETGET_STACK_FUNCS(stack_dev_replace_cursor_right,

			 struct btrfs_dev_replace_item, cursor_right, 64);



/* btrfs_verity_descriptor_item */

BTRFS_SETGET_FUNCS(verity_descriptor_encryption, struct btrfs_verity_descriptor_item,

		   encryption, 8);

BTRFS_SETGET_FUNCS(verity_descriptor_size, struct btrfs_verity_descriptor_item,

		   size, 64);

BTRFS_SETGET_STACK_FUNCS(stack_verity_descriptor_encryption,

			 struct btrfs_verity_descriptor_item, encryption, 8);

BTRFS_SETGET_STACK_FUNCS(stack_verity_descriptor_size,

			 struct btrfs_verity_descriptor_item, size, 64);



/* helper function to cast into the data area of the leaf. */

#define btrfs_item_ptr(leaf, slot, type) \

	((type *)(BTRFS_LEAF_DATA_OFFSET + \
@@ -3720,15 +3730,6 @@ extern const struct fsverity_operations btrfs_verityops; 
int btrfs_drop_verity_items(struct btrfs_inode *inode);

int btrfs_get_verity_descriptor(struct inode *inode, void *buf, size_t buf_size);



BTRFS_SETGET_FUNCS(verity_descriptor_encryption, struct btrfs_verity_descriptor_item,

		   encryption, 8);

BTRFS_SETGET_FUNCS(verity_descriptor_size, struct btrfs_verity_descriptor_item,

		   size, 64);

BTRFS_SETGET_STACK_FUNCS(stack_verity_descriptor_encryption,

			 struct btrfs_verity_descriptor_item, encryption, 8);

BTRFS_SETGET_STACK_FUNCS(stack_verity_descriptor_size,

			 struct btrfs_verity_descriptor_item, size, 64);



#else



static inline int btrfs_drop_verity_items(struct btrfs_inode *inode)