csum data struct changes

master
Chris Mason 2007-03-29 15:15:49 -04:00 committed by David Woodhouse
parent f66f572037
commit b21892315c
2 changed files with 11 additions and 10 deletions

View File

@ -107,14 +107,14 @@ static int comp_keys(struct btrfs_disk_key *disk, struct btrfs_key *k2)
return 1; return 1;
if (k1.objectid < k2->objectid) if (k1.objectid < k2->objectid)
return -1; return -1;
if (k1.flags > k2->flags)
return 1;
if (k1.flags < k2->flags)
return -1;
if (k1.offset > k2->offset) if (k1.offset > k2->offset)
return 1; return 1;
if (k1.offset < k2->offset) if (k1.offset < k2->offset)
return -1; return -1;
if (k1.flags > k2->flags)
return 1;
if (k1.flags < k2->flags)
return -1;
return 0; return 0;
} }

13
ctree.h
View File

@ -30,14 +30,14 @@ struct btrfs_trans_handle;
*/ */
struct btrfs_disk_key { struct btrfs_disk_key {
__le64 objectid; __le64 objectid;
__le32 flags;
__le64 offset; __le64 offset;
__le32 flags;
} __attribute__ ((__packed__)); } __attribute__ ((__packed__));
struct btrfs_key { struct btrfs_key {
u64 objectid; u64 objectid;
u32 flags;
u64 offset; u64 offset;
u32 flags;
} __attribute__ ((__packed__)); } __attribute__ ((__packed__));
/* /*
@ -272,27 +272,28 @@ struct btrfs_root {
* a (hopefully) huge chunk of disk * a (hopefully) huge chunk of disk
*/ */
#define BTRFS_EXTENT_DATA_KEY 4 #define BTRFS_EXTENT_DATA_KEY 4
#define BTRFS_CSUM_ITEM_KEY 5
/* /*
* root items point to tree roots. There are typically in the root * root items point to tree roots. There are typically in the root
* tree used by the super block to find all the other trees * tree used by the super block to find all the other trees
*/ */
#define BTRFS_ROOT_ITEM_KEY 5 #define BTRFS_ROOT_ITEM_KEY 6
/* /*
* extent items are in the extent map tree. These record which blocks * extent items are in the extent map tree. These record which blocks
* are used, and how many references there are to each block * are used, and how many references there are to each block
*/ */
#define BTRFS_EXTENT_ITEM_KEY 6 #define BTRFS_EXTENT_ITEM_KEY 7
/* /*
* the inode map records which inode numbers are in use and where * the inode map records which inode numbers are in use and where
* they actually live on disk * they actually live on disk
*/ */
#define BTRFS_INODE_MAP_ITEM_KEY 7 #define BTRFS_INODE_MAP_ITEM_KEY 8
/* /*
* string items are for debugging. They just store a short string of * string items are for debugging. They just store a short string of
* data in the FS * data in the FS
*/ */
#define BTRFS_STRING_ITEM_KEY 8 #define BTRFS_STRING_ITEM_KEY 9
static inline u64 btrfs_inode_generation(struct btrfs_inode_item *i) static inline u64 btrfs_inode_generation(struct btrfs_inode_item *i)
{ {