From 07a4f1b81df6cd9b9e09773f680fc098faed310c Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 5 Dec 2007 10:41:38 -0500 Subject: Update btrfs-progs to better match the kernel --- dir-item.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 89 insertions(+), 25 deletions(-) (limited to 'dir-item.c') diff --git a/dir-item.c b/dir-item.c index 3c49c56..a3cb278 100644 --- a/dir-item.c +++ b/dir-item.c @@ -30,21 +30,25 @@ static struct btrfs_dir_item *insert_with_overflow(struct struct btrfs_root *root, struct btrfs_path *path, struct btrfs_key *cpu_key, - u32 data_size) + u32 data_size, + const char *name, + int name_len) { int ret; char *ptr; struct btrfs_item *item; struct btrfs_leaf *leaf; - ret = btrfs_insert_empty_item(trans, root, path, cpu_key, data_size); if (ret == -EEXIST) { - ret = btrfs_extend_item(trans, root, path, data_size); - BUG_ON(ret > 0); - if (ret) + struct btrfs_dir_item *di; + di = btrfs_match_dir_item_name(root, path, name, name_len); + if (di) return NULL; + ret = btrfs_extend_item(trans, root, path, data_size); } BUG_ON(ret > 0); + if (ret) + return NULL; leaf = &path->nodes[0]->leaf; item = leaf->items + path->slots[0]; ptr = btrfs_item_ptr(leaf, path->slots[0], char); @@ -75,7 +79,8 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root BUG_ON(ret); btrfs_init_path(&path); data_size = sizeof(*dir_item) + name_len; - dir_item = insert_with_overflow(trans, root, &path, &key, data_size); + dir_item = insert_with_overflow(trans, root, &path, &key, data_size, + name, name_len); if (!dir_item) { ret = -1; goto out; @@ -94,7 +99,8 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root btrfs_release_path(root, &path); btrfs_set_key_type(&key, BTRFS_DIR_INDEX_KEY); key.offset = location->objectid; - dir_item = insert_with_overflow(trans, root, &path, &key, data_size); + dir_item = insert_with_overflow(trans, root, &path, &key, data_size, + name, name_len); if (!dir_item) { ret = -1; goto out; @@ -109,37 +115,95 @@ out: btrfs_release_path(root, &path); return ret; } - -int btrfs_lookup_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root - *root, struct btrfs_path *path, u64 dir, char *name, - int name_len, int mod) +struct btrfs_dir_item *btrfs_lookup_dir_item(struct btrfs_trans_handle *trans, + struct btrfs_root *root, + struct btrfs_path *path, u64 dir, + char *name, int name_len, int mod) { int ret; struct btrfs_key key; int ins_len = mod < 0 ? -1 : 0; int cow = mod != 0; - + struct btrfs_key found_key; + struct btrfs_leaf *leaf; key.objectid = dir; btrfs_set_key_type(&key, BTRFS_DIR_ITEM_KEY); ret = btrfs_name_hash(name, name_len, &key.offset); BUG_ON(ret); ret = btrfs_search_slot(trans, root, &key, path, ins_len, cow); - return ret; + if (ret < 0) + return NULL; + if (ret > 0) { + if (path->slots[0] == 0) + return NULL; + path->slots[0]--; + } + + leaf = &path->nodes[0]->leaf; + btrfs_disk_key_to_cpu(&found_key, &leaf->items[path->slots[0]].key); + + if (found_key.objectid != dir || + btrfs_key_type(&found_key) != BTRFS_DIR_ITEM_KEY || + found_key.offset != key.offset) + return NULL; + + return btrfs_match_dir_item_name(root, path, name, name_len); } -int btrfs_match_dir_item_name(struct btrfs_root *root, - struct btrfs_path *path, char - *name, int name_len) +struct btrfs_dir_item *btrfs_match_dir_item_name(struct btrfs_root *root, + struct btrfs_path *path, + const char *name, int name_len) { - struct btrfs_dir_item *dir_item; + u32 cur = 0; + u32 this_len; + u32 total_len; char *name_ptr; + struct btrfs_leaf *leaf; + struct btrfs_dir_item *dir_item; - dir_item = btrfs_item_ptr(&path->nodes[0]->leaf, path->slots[0], - struct btrfs_dir_item); - if (btrfs_dir_name_len(dir_item) != name_len) - return 0; - name_ptr = (char *)(dir_item + 1); - if (memcmp(name_ptr, name, name_len)) - return 0; - return 1; + leaf = &path->nodes[0]->leaf; + dir_item = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_dir_item); + total_len = btrfs_item_size(leaf->items + path->slots[0]); + while(cur < total_len) { + this_len = sizeof(*dir_item) + btrfs_dir_name_len(dir_item) + + btrfs_dir_data_len(dir_item); + name_ptr = (char *)(dir_item + 1); + + if (btrfs_dir_name_len(dir_item) == name_len && + memcmp(name, name_ptr, name_len) == 0) + return dir_item; + + cur += this_len; + dir_item = (struct btrfs_dir_item *)((char *)dir_item + + this_len); + } + return NULL; +} + +int btrfs_delete_one_dir_name(struct btrfs_trans_handle *trans, + struct btrfs_root *root, + struct btrfs_path *path, + struct btrfs_dir_item *di) +{ + + struct btrfs_leaf *leaf; + u32 sub_item_len; + u32 item_len; + int ret = 0; + + leaf = &path->nodes[0]->leaf; + sub_item_len = sizeof(*di) + btrfs_dir_name_len(di) + + btrfs_dir_data_len(di); + item_len = btrfs_item_size(leaf->items + path->slots[0]); + if (sub_item_len == item_len) { + ret = btrfs_del_item(trans, root, path); + } else { + char *ptr = (char *)di; + char *start = btrfs_item_ptr(leaf, path->slots[0], char); + memmove(ptr, ptr + sub_item_len, + item_len - (ptr + sub_item_len - start)); + ret = btrfs_truncate_item(trans, root, path, + item_len - sub_item_len, 1); + } + return 0; } -- cgit v1.2.1