Btrfs: finish off inode indexing in dirs, add overflows
Signed-off-by: Chris Mason <chris.mason@oracle.com>
diff --git a/fs/btrfs/dir-item.c b/fs/btrfs/dir-item.c
index 62d0c09..b1629a5 100644
--- a/fs/btrfs/dir-item.c
+++ b/fs/btrfs/dir-item.c
@@ -4,6 +4,26 @@
#include "hash.h"
#include "transaction.h"
+int insert_with_overflow(struct btrfs_trans_handle *trans, struct btrfs_root
+ *root, struct btrfs_path *path, struct btrfs_key
+ *cpu_key, u32 data_size)
+{
+ int overflow;
+ int ret;
+
+ ret = btrfs_insert_empty_item(trans, root, path, cpu_key, data_size);
+ overflow = btrfs_key_overflow(cpu_key);
+
+ while(ret == -EEXIST && overflow < BTRFS_KEY_OVERFLOW_MAX) {
+ overflow++;
+ btrfs_set_key_overflow(cpu_key, overflow);
+ btrfs_release_path(root, path);
+ ret = btrfs_insert_empty_item(trans, root, path, cpu_key,
+ data_size);
+ }
+ return ret;
+}
+
int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root
*root, const char *name, int name_len, u64 dir, u64
objectid, u8 type)
@@ -23,7 +43,7 @@
path = btrfs_alloc_path();
btrfs_init_path(path);
data_size = sizeof(*dir_item) + name_len;
- ret = btrfs_insert_empty_item(trans, root, path, &key, data_size);
+ ret = insert_with_overflow(trans, root, path, &key, data_size);
if (ret)
goto out;
@@ -41,7 +61,7 @@
btrfs_set_key_type(&key, BTRFS_DIR_INDEX_KEY);
key.offset = objectid;
- ret = btrfs_insert_empty_item(trans, root, path, &key, data_size);
+ ret = insert_with_overflow(trans, root, path, &key, data_size);
// FIXME clear the dirindex bit
if (ret)
goto out;
@@ -70,14 +90,40 @@
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;
key.objectid = dir;
key.flags = 0;
btrfs_set_key_type(&key, BTRFS_DIR_ITEM_KEY);
+ btrfs_set_key_overflow(&key, BTRFS_KEY_OVERFLOW_MAX - 1);
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;
+ while(1) {
+ ret = btrfs_search_slot(trans, root, &key, path, ins_len, cow);
+ if (ret < 0)
+ return ret;
+ if (ret > 0) {
+ if (path->slots[0] == 0)
+ return 1;
+ path->slots[0]--;
+ }
+ 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_ITEM_KEY ||
+ btrfs_disk_key_offset(found_key) != key.offset)
+ return 1;
+
+ if (btrfs_match_dir_item_name(root, path, name, name_len))
+ return 0;
+
+ if (btrfs_disk_key_overflow(found_key) == 0)
+ return 1;
+ btrfs_release_path(root, path);
+ }
+ return 1;
}
int btrfs_lookup_dir_index_item(struct btrfs_trans_handle *trans,
@@ -89,13 +135,31 @@
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;
key.objectid = dir;
key.flags = 0;
btrfs_set_key_type(&key, BTRFS_DIR_INDEX_KEY);
+ btrfs_set_key_overflow(&key, BTRFS_KEY_OVERFLOW_MAX - 1);
key.offset = objectid;
ret = btrfs_search_slot(trans, root, &key, path, ins_len, cow);
- return ret;
+ if (ret < 0)
+ return ret;
+ if (ret > 0) {
+ if (path->slots[0] == 0)
+ return 1;
+ path->slots[0]--;
+ }
+ 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,