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

btrfs: move root helpers back into ctree.h 



These accidentally got brought into accessors.h, but belong with the
btrfs_root definitions which are currently in ctree.h.  Move these to
make it easier to sync accessors.[ch] into btrfs-progs.

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

fs/btrfs/accessors.h

+0 −17
Original line number Diff line number Diff line
@@ -712,23 +712,6 @@ BTRFS_SETGET_STACK_FUNCS(root_otransid, struct btrfs_root_item, otransid, 64); 
BTRFS_SETGET_STACK_FUNCS(root_stransid, struct btrfs_root_item, stransid, 64);

BTRFS_SETGET_STACK_FUNCS(root_rtransid, struct btrfs_root_item, rtransid, 64);



static inline bool btrfs_root_readonly(const struct btrfs_root *root)

{

	/* Byte-swap the constant at compile time, root_item::flags is LE */

	return (root->root_item.flags & cpu_to_le64(BTRFS_ROOT_SUBVOL_RDONLY)) != 0;

}



static inline bool btrfs_root_dead(const struct btrfs_root *root)

{

	/* Byte-swap the constant at compile time, root_item::flags is LE */

	return (root->root_item.flags & cpu_to_le64(BTRFS_ROOT_SUBVOL_DEAD)) != 0;

}



static inline u64 btrfs_root_id(const struct btrfs_root *root)

{

	return root->root_key.objectid;

}



/* struct btrfs_root_backup */

BTRFS_SETGET_STACK_FUNCS(backup_tree_root, struct btrfs_root_backup,

		   tree_root, 64);

fs/btrfs/ctree.h

+17 −0
Original line number Diff line number Diff line
@@ -335,6 +335,23 @@ struct btrfs_root { 
#endif

};



static inline bool btrfs_root_readonly(const struct btrfs_root *root)

{

	/* Byte-swap the constant at compile time, root_item::flags is LE */

	return (root->root_item.flags & cpu_to_le64(BTRFS_ROOT_SUBVOL_RDONLY)) != 0;

}



static inline bool btrfs_root_dead(const struct btrfs_root *root)

{

	/* Byte-swap the constant at compile time, root_item::flags is LE */

	return (root->root_item.flags & cpu_to_le64(BTRFS_ROOT_SUBVOL_DEAD)) != 0;

}



static inline u64 btrfs_root_id(const struct btrfs_root *root)

{

	return root->root_key.objectid;

}



/*

 * Structure that conveys information about an extent that is going to replace

 * all the extents in a file range.