summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2007-04-05 12:13:45 -0400
committerDavid Woodhouse <dwmw2@hera.kernel.org>2007-04-05 12:13:45 -0400
commitb6414c8ee26632d99a3763cd493c4cff8fe8e950 (patch)
treef1fc477cca7a0075b8c50c07f6f6589a2b961d21
parent6542904d952d24a6e0c77f5ebf1d8f65196d8b81 (diff)
finish off inode indexing in dirs, add overflows
-rw-r--r--ctree.h75
-rw-r--r--dir-item.c28
2 files changed, 93 insertions, 10 deletions
diff --git a/ctree.h b/ctree.h
index b75ab4b1..d35db820 100644
--- a/ctree.h
+++ b/ctree.h
@@ -8,12 +8,19 @@ struct btrfs_trans_handle;
#define BTRFS_MAGIC "_BtRfS_M"
-#define BTRFS_ROOT_TREE_OBJECTID 1
-#define BTRFS_EXTENT_TREE_OBJECTID 2
-#define BTRFS_INODE_MAP_OBJECTID 3
-#define BTRFS_FS_TREE_OBJECTID 4
-#define BTRFS_FIRST_FREE_OBJECTID 5
+#define BTRFS_ROOT_TREE_OBJECTID 1ULL
+#define BTRFS_EXTENT_TREE_OBJECTID 2ULL
+#define BTRFS_INODE_MAP_OBJECTID 3ULL
+#define BTRFS_FS_TREE_OBJECTID 4ULL
+#define BTRFS_FIRST_FREE_OBJECTID 5ULL
+/*
+ * we can actually store much bigger names, but lets not confuse the rest
+ * of linux
+ */
+#define BTRFS_NAME_LEN 255
+
+/* 32 bytes in various csum fields */
#define BTRFS_CSUM_SIZE 32
/*
@@ -258,6 +265,10 @@ struct btrfs_root {
#define BTRFS_KEY_TYPE_MAX 256
#define BTRFS_KEY_TYPE_MASK (BTRFS_KEY_TYPE_MAX - 1)
+#define BTRFS_KEY_OVERFLOW_MAX 128
+#define BTRFS_KEY_OVERFLOW_SHIFT 8
+#define BTRFS_KEY_OVERFLOW_MASK (0x7FULL << BTRFS_KEY_OVERFLOW_SHIFT)
+
/*
* inode items have the data typically returned from stat and store other
* info about object characteristics. There is one for every file and dir in
@@ -280,7 +291,11 @@ struct btrfs_root {
* a (hopefully) huge chunk of disk
*/
#define BTRFS_EXTENT_DATA_KEY 5
+/*
+ * csum items have the checksums for data in the extents
+ */
#define BTRFS_CSUM_ITEM_KEY 6
+
/*
* root items point to tree roots. There are typically in the root
* tree used by the super block to find all the other trees
@@ -405,6 +420,27 @@ static inline void btrfs_set_inode_compat_flags(struct btrfs_inode_item *i,
i->compat_flags = cpu_to_le16(val);
}
+static inline u64 btrfs_timespec_sec(struct btrfs_inode_timespec *ts)
+{
+ return le64_to_cpu(ts->sec);
+}
+
+static inline void btrfs_set_timespec_sec(struct btrfs_inode_timespec *ts,
+ u64 val)
+{
+ ts->sec = cpu_to_le64(val);
+}
+
+static inline u32 btrfs_timespec_nsec(struct btrfs_inode_timespec *ts)
+{
+ return le32_to_cpu(ts->nsec);
+}
+
+static inline void btrfs_set_timespec_nsec(struct btrfs_inode_timespec *ts,
+ u32 val)
+{
+ ts->nsec = cpu_to_le32(val);
+}
static inline u64 btrfs_extent_owner(struct btrfs_extent_item *ei)
{
@@ -551,6 +587,19 @@ static inline void btrfs_set_disk_key_flags(struct btrfs_disk_key *disk,
disk->flags = cpu_to_le32(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;
+}
+
+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;
@@ -575,6 +624,22 @@ static inline void btrfs_set_disk_key_type(struct btrfs_disk_key *key, u32 type)
btrfs_set_disk_key_flags(key, flags);
}
+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;
+}
+
+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;
+ btrfs_set_disk_key_flags(key, flags);
+}
+
static inline u64 btrfs_header_blocknr(struct btrfs_header *h)
{
return le64_to_cpu(h->blocknr);
diff --git a/dir-item.c b/dir-item.c
index 1b1fc9be..fff16348 100644
--- a/dir-item.c
+++ b/dir-item.c
@@ -7,6 +7,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, char *name, int name_len, u64 dir, u64
objectid, u8 type)
@@ -30,7 +50,7 @@ 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;
- 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;
@@ -43,13 +63,10 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root
name_ptr = (char *)(dir_item + 1);
memcpy(name_ptr, name, name_len);
- // FIXME don't be stupid
- if (key.offset == 2)
- goto out;
btrfs_release_path(root, &path);
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);
if (ret)
goto out;
@@ -78,6 +95,7 @@ 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);