summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/dir-item.c
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2007-04-18 16:15:28 -0400
committerDavid Woodhouse <dwmw2@hera.kernel.org>2007-04-18 16:15:28 -0400
commita429e51371eee3c989160c003ee40bc3947c6a76 (patch)
tree863b55de8823be579264260a51407cd90aac103d /fs/btrfs/dir-item.c
parent70b2befd0c8a4064715d8b340270650cc9d15af8 (diff)
downloadlinux-a429e51371eee3c989160c003ee40bc3947c6a76.tar.gz
linux-a429e51371eee3c989160c003ee40bc3947c6a76.tar.bz2
linux-a429e51371eee3c989160c003ee40bc3947c6a76.zip
Btrfs: working file_write, reorganized key flags
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/dir-item.c')
-rw-r--r--fs/btrfs/dir-item.c70
1 files changed, 0 insertions, 70 deletions
diff --git a/fs/btrfs/dir-item.c b/fs/btrfs/dir-item.c
index cd4137a8b87e..a43deb726486 100644
--- a/fs/btrfs/dir-item.c
+++ b/fs/btrfs/dir-item.c
@@ -58,30 +58,6 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root
btrfs_memcpy(root, path->nodes[0]->b_data, name_ptr, name, name_len);
btrfs_mark_buffer_dirty(path->nodes[0]);
-
- /* 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);
- // FIXME clear the dirindex bit
- if (ret)
- goto out;
-
- dir_item = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]),
- 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);
- btrfs_memcpy(root, path->nodes[0]->b_data, name_ptr, name, name_len);
- btrfs_mark_buffer_dirty(path->nodes[0]);
out:
btrfs_release_path(root, path);
btrfs_free_path(path);
@@ -135,52 +111,6 @@ int btrfs_lookup_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root
return 1;
}
-int btrfs_lookup_dir_index_item(struct btrfs_trans_handle *trans,
- struct btrfs_root *root,
- struct btrfs_path *path, u64 dir,
- u64 objectid, int mod)
-{
- int ret;
- struct btrfs_key key;
- int ins_len = mod < 0 ? -1 : 0;
- int cow = mod != 0;
- struct btrfs_disk_key *found_key;
- struct btrfs_leaf *leaf;
- int overflow = 0;
-
- key.objectid = dir;
- key.flags = 0;
- btrfs_set_key_type(&key, BTRFS_DIR_INDEX_KEY);
- key.offset = objectid;
-
- while(1) {
- btrfs_set_key_overflow(&key, overflow);
- ret = btrfs_search_slot(trans, root, &key, path, ins_len, cow);
- if (ret < 0)
- return ret;
- if (ret > 0) {
- if (overflow >= BTRFS_KEY_OVERFLOW_MAX)
- return 1;
- overflow++;
- btrfs_set_key_overflow(&key, overflow);
- btrfs_release_path(root, path);
- continue;
- } else {
- /* found */
- break;
- }
- }
- leaf = btrfs_buffer_leaf(path->nodes[0]);
- found_key = &leaf->items[path->slots[0]].key;
-
- if (btrfs_disk_key_objectid(found_key) != dir ||
- btrfs_disk_key_type(found_key) != BTRFS_DIR_INDEX_KEY)
- return 1;
- if (btrfs_disk_key_offset(found_key) == objectid)
- return 0;
- return 1;
-}
-
int btrfs_match_dir_item_name(struct btrfs_root *root,
struct btrfs_path *path,
const char *name, int name_len)