disk format updates for finding dead roots

master
Chris Mason 2007-06-22 14:37:48 -04:00 committed by David Woodhouse
parent 4e5ca58de0
commit c3bbf0c093
2 changed files with 15 additions and 3 deletions

16
ctree.h
View File

@ -109,12 +109,12 @@ struct btrfs_super_block {
u8 fsid[16]; /* FS specific uuid */ u8 fsid[16]; /* FS specific uuid */
__le64 blocknr; /* this block number */ __le64 blocknr; /* this block number */
__le64 magic; __le64 magic;
__le32 blocksize;
__le64 generation; __le64 generation;
__le64 root; __le64 root;
__le64 total_blocks; __le64 total_blocks;
__le64 blocks_used; __le64 blocks_used;
__le64 root_dir_objectid; __le64 root_dir_objectid;
__le32 blocksize;
} __attribute__ ((__packed__)); } __attribute__ ((__packed__));
/* /*
@ -218,10 +218,12 @@ struct btrfs_root_item {
struct btrfs_inode_item inode; struct btrfs_inode_item inode;
__le64 root_dirid; __le64 root_dirid;
__le64 blocknr; __le64 blocknr;
__le32 flags;
__le64 block_limit; __le64 block_limit;
__le64 blocks_used; __le64 blocks_used;
__le32 flags;
__le32 refs; __le32 refs;
struct btrfs_disk_key drop_progress;
u8 drop_level;
} __attribute__ ((__packed__)); } __attribute__ ((__packed__));
#define BTRFS_FILE_EXTENT_REG 0 #define BTRFS_FILE_EXTENT_REG 0
@ -770,6 +772,16 @@ static inline void btrfs_set_root_refs(struct btrfs_root_item *item, u32 val)
item->refs = cpu_to_le32(val); item->refs = cpu_to_le32(val);
} }
static inline u32 btrfs_root_flags(struct btrfs_root_item *item)
{
return le32_to_cpu(item->flags);
}
static inline void btrfs_set_root_flags(struct btrfs_root_item *item, u32 val)
{
item->flags = cpu_to_le32(val);
}
static inline u64 btrfs_super_blocknr(struct btrfs_super_block *s) static inline u64 btrfs_super_blocknr(struct btrfs_super_block *s)
{ {
return le64_to_cpu(s->blocknr); return le64_to_cpu(s->blocknr);

View File

@ -35,7 +35,7 @@ int btrfs_find_last_root(struct btrfs_root *root, u64 objectid,
search_key.objectid = objectid; search_key.objectid = objectid;
search_key.flags = (u32)-1; search_key.flags = (u32)-1;
search_key.offset = (u32)-1; search_key.offset = (u64)-1;
btrfs_init_path(&path); btrfs_init_path(&path);
ret = btrfs_search_slot(NULL, root, &search_key, &path, 0, 0); ret = btrfs_search_slot(NULL, root, &search_key, &path, 0, 0);