RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-02-15 09:06:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

key flag reorg

Browse Source
This commit is contained in:
Chris Mason 2007-04-18 16:15:47 -04:00 committed by David Woodhouse
parent 8d1d13c786
commit 8c973943bb
3 changed files with 38 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
ctree.h
View File

@ -270,11 +270,12 @@ struct btrfs_root {
/* the lower bits in the key flags defines the item type */
#define BTRFS_KEY_TYPE_MAX 256
#define BTRFS_KEY_TYPE_MASK (BTRFS_KEY_TYPE_MAX - 1)
#define BTRFS_KEY_TYPE_SHIFT 24
#define BTRFS_KEY_TYPE_MASK (((u32)BTRFS_KEY_TYPE_MAX - 1) << \
BTRFS_KEY_TYPE_SHIFT)
#define BTRFS_KEY_OVERFLOW_MAX 128
#define BTRFS_KEY_OVERFLOW_SHIFT 8
#define BTRFS_KEY_OVERFLOW_MASK (0x7FULL << BTRFS_KEY_OVERFLOW_SHIFT)
#define BTRFS_KEY_OVERFLOW_MASK ((u32)BTRFS_KEY_OVERFLOW_MAX - 1)
/*
* inode items have the data typically returned from stat and store other
@ -574,56 +575,55 @@ static inline void btrfs_set_disk_key_flags(struct btrfs_disk_key *disk,
disk->flags = cpu_to_le32(val);
}
static inline u32 btrfs_disk_key_type(struct btrfs_disk_key *key)
{
return le32_to_cpu(key->flags) >> BTRFS_KEY_TYPE_SHIFT;
}
static inline void btrfs_set_disk_key_type(struct btrfs_disk_key *key,
u32 val)
{
u32 flags = btrfs_disk_key_flags(key);
BUG_ON(val >= BTRFS_KEY_TYPE_MAX);
val = val << BTRFS_KEY_TYPE_SHIFT;
flags = (flags & ~BTRFS_KEY_TYPE_MASK) | val;
btrfs_set_disk_key_flags(key, flags);
}
static inline u32 btrfs_key_type(struct btrfs_key *key)
{
return key->flags >> BTRFS_KEY_TYPE_SHIFT;
}
static inline void btrfs_set_key_type(struct btrfs_key *key, u32 val)
{
BUG_ON(val >= BTRFS_KEY_TYPE_MAX);
val = val << BTRFS_KEY_TYPE_SHIFT;
key->flags = (key->flags & ~(BTRFS_KEY_TYPE_MASK)) | val;
}
static inline u32 btrfs_key_overflow(struct btrfs_key *key)
{
u32 over = key->flags & BTRFS_KEY_OVERFLOW_MASK;
return over >> BTRFS_KEY_OVERFLOW_SHIFT;
return key->flags & BTRFS_KEY_OVERFLOW_MASK;
}
static inline void btrfs_set_key_overflow(struct btrfs_key *key, u32 over)
{
BUG_ON(over >= BTRFS_KEY_OVERFLOW_MAX);
over = over << BTRFS_KEY_OVERFLOW_SHIFT;
key->flags = (key->flags & ~((u64)BTRFS_KEY_OVERFLOW_MASK)) | over;
}
static inline u32 btrfs_key_type(struct btrfs_key *key)
{
return key->flags & BTRFS_KEY_TYPE_MASK;
}
static inline u32 btrfs_disk_key_type(struct btrfs_disk_key *key)
{
return le32_to_cpu(key->flags) & BTRFS_KEY_TYPE_MASK;
}
static inline void btrfs_set_key_type(struct btrfs_key *key, u32 type)
{
BUG_ON(type >= BTRFS_KEY_TYPE_MAX);
key->flags = (key->flags & ~((u64)BTRFS_KEY_TYPE_MASK)) | type;
}
static inline void btrfs_set_disk_key_type(struct btrfs_disk_key *key, u32 type)
{
u32 flags = btrfs_disk_key_flags(key);
BUG_ON(type >= BTRFS_KEY_TYPE_MAX);
flags = (flags & ~((u64)BTRFS_KEY_TYPE_MASK)) | type;
btrfs_set_disk_key_flags(key, flags);
key->flags = (key->flags & ~BTRFS_KEY_OVERFLOW_MASK) | over;
}
static inline u32 btrfs_disk_key_overflow(struct btrfs_disk_key *key)
{
u32 over = le32_to_cpu(key->flags) & BTRFS_KEY_OVERFLOW_MASK;
return over >> BTRFS_KEY_OVERFLOW_SHIFT;
return le32_to_cpu(key->flags) & BTRFS_KEY_OVERFLOW_MASK;
}
static inline void btrfs_set_disK_key_overflow(struct btrfs_disk_key *key,
static inline void btrfs_set_disk_key_overflow(struct btrfs_disk_key *key,
u32 over)
{
u32 flags = btrfs_disk_key_flags(key);
BUG_ON(over >= BTRFS_KEY_OVERFLOW_MAX);
over = over << BTRFS_KEY_OVERFLOW_SHIFT;
flags = (flags & ~((u64)BTRFS_KEY_OVERFLOW_MASK)) | over;
flags = (flags & ~BTRFS_KEY_OVERFLOW_MASK) | over;
btrfs_set_disk_key_flags(key, flags);
}

21
dir-item.c
View File

@ -62,26 +62,6 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root
btrfs_set_dir_name_len(dir_item, name_len);
name_ptr = (char *)(dir_item + 1);
memcpy(name_ptr, name, name_len);
/* FIXME, use some real flag for selecting the extra index */
if (root == root->fs_info->tree_root)
goto out;
btrfs_release_path(root, &path);
btrfs_set_key_type(&key, BTRFS_DIR_INDEX_KEY);
key.offset = location->objectid;
ret = insert_with_overflow(trans, root, &path, &key, data_size);
if (ret)
goto out;
dir_item = btrfs_item_ptr(&path.nodes[0]->leaf, path.slots[0],
struct btrfs_dir_item);
btrfs_cpu_key_to_disk(&dir_item->location, location);
btrfs_set_dir_type(dir_item, type);
btrfs_set_dir_flags(dir_item, 0);
btrfs_set_dir_name_len(dir_item, name_len);
name_ptr = (char *)(dir_item + 1);
memcpy(name_ptr, name, name_len);
out:
btrfs_release_path(root, &path);
return ret;
@ -99,7 +79,6 @@ int btrfs_lookup_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root
key.objectid = dir;
key.flags = 0;
btrfs_set_key_type(&key, BTRFS_DIR_ITEM_KEY);
btrfs_set_key_overflow(&key, BTRFS_KEY_OVERFLOW_MAX);
ret = btrfs_name_hash(name, name_len, &key.offset);
BUG_ON(ret);
ret = btrfs_search_slot(trans, root, &key, path, ins_len, cow);

4
print-tree.c
View File

@ -28,7 +28,7 @@ void btrfs_print_leaf(struct btrfs_root *root, struct btrfs_leaf *l)
for (i = 0 ; i < nr ; i++) {
item = l->items + i;
type = btrfs_disk_key_type(&item->key);
printf("\titem %d key (%Lu %u %Lu) itemoff %d itemsize %d\n",
printf("\titem %d key (%Lu %x %Lu) itemoff %d itemsize %d\n",
i,
btrfs_disk_key_objectid(&item->key),
btrfs_disk_key_flags(&item->key),
@ -129,7 +129,7 @@ void btrfs_print_tree(struct btrfs_root *root, struct btrfs_buffer *t)
btrfs_header_generation(&c->header));
fflush(stdout);
for (i = 0; i < nr; i++) {
printf("\tkey %d (%Lu %u %Lu) block %Lu\n",
printf("\tkey %d (%Lu %x %Lu) block %Lu\n",
i,
c->ptrs[i].key.objectid,
c->ptrs[i].key.flags,