Btrfs: finish off inode indexing in dirs, add overflows
Signed-off-by: Chris Mason <chris.mason@oracle.com>
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 61d7b47..794f7e4 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -270,6 +270,10 @@
#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
@@ -588,6 +592,19 @@
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;
@@ -612,6 +629,22 @@
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);