diff options
author | Chris Mason <chris.mason@oracle.com> | 2007-03-21 11:12:56 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@hera.kernel.org> | 2007-03-21 11:12:56 -0400 |
commit | 2e635a278354a1a7951e16cfea4c247d6d0e7c99 (patch) | |
tree | 4b94d54ddcd7cb184681260738b68caef4edee81 /fs/btrfs/ctree.h | |
parent | 1261ec42b3d3a3ad878bd172144940e3ac710749 (diff) |
Btrfs: initial move to kernel module land
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/ctree.h')
-rw-r--r-- | fs/btrfs/ctree.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 1a4d1d6fa401..ae8518cb94bf 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h | |||
@@ -1,9 +1,6 @@ | |||
1 | #ifndef __BTRFS__ | 1 | #ifndef __BTRFS__ |
2 | #define __BTRFS__ | 2 | #define __BTRFS__ |
3 | 3 | ||
4 | #include "list.h" | ||
5 | #include "kerncompat.h" | ||
6 | |||
7 | struct btrfs_trans_handle; | 4 | struct btrfs_trans_handle; |
8 | 5 | ||
9 | #define BTRFS_MAGIC "_BtRfS_M" | 6 | #define BTRFS_MAGIC "_BtRfS_M" |
@@ -75,6 +72,7 @@ struct btrfs_super_block { | |||
75 | __le64 root; | 72 | __le64 root; |
76 | __le64 total_blocks; | 73 | __le64 total_blocks; |
77 | __le64 blocks_used; | 74 | __le64 blocks_used; |
75 | __le64 root_dir_objectid; | ||
78 | } __attribute__ ((__packed__)); | 76 | } __attribute__ ((__packed__)); |
79 | 77 | ||
80 | /* | 78 | /* |
@@ -693,6 +691,17 @@ static inline void btrfs_set_super_blocksize(struct btrfs_super_block *s, | |||
693 | s->blocksize = cpu_to_le32(val); | 691 | s->blocksize = cpu_to_le32(val); |
694 | } | 692 | } |
695 | 693 | ||
694 | static inline u64 btrfs_super_root_dir(struct btrfs_super_block *s) | ||
695 | { | ||
696 | return le64_to_cpu(s->root_dir_objectid); | ||
697 | } | ||
698 | |||
699 | static inline void btrfs_set_super_root_dir(struct btrfs_super_block *s, u64 | ||
700 | val) | ||
701 | { | ||
702 | s->root_dir_objectid = cpu_to_le64(val); | ||
703 | } | ||
704 | |||
696 | static inline u8 *btrfs_leaf_data(struct btrfs_leaf *l) | 705 | static inline u8 *btrfs_leaf_data(struct btrfs_leaf *l) |
697 | { | 706 | { |
698 | return (u8 *)l->items; | 707 | return (u8 *)l->items; |