Merge branch 'for-linus2' of git://git.kernel.dk/linux-2.6-block

[safe/jmp/linux-2.6] / fs / btrfs / extent_map.h

diff --git a/fs/btrfs/extent_map.h b/fs/btrfs/extent_map.h
index 26ac6fe..ab6d74b 100644 (file)
--- a/fs/btrfs/extent_map.h
+++ b/fs/btrfs/extent_map.h
@@ -10,6 +10,9 @@
 
 /* bits for the flags field */
 #define EXTENT_FLAG_PINNED 0 /* this entry not yet on disk, don't free it */
+#define EXTENT_FLAG_COMPRESSED 1
+#define EXTENT_FLAG_VACANCY 2 /* no file extent item found */
+#define EXTENT_FLAG_PREALLOC 3 /* pre-allocated extent */
 
 struct extent_map {
        struct rb_node rb_node;
@@ -17,7 +20,9 @@ struct extent_map {
        /* all of these are in bytes */
        u64 start;
        u64 len;
+       u64 orig_start;
        u64 block_start;
+       u64 block_len;
        unsigned long flags;
        struct block_device *bdev;
        atomic_t refs;
@@ -26,7 +31,7 @@ struct extent_map {
 
 struct extent_map_tree {
        struct rb_root map;
-       spinlock_t lock;
+       rwlock_t lock;
 };
 
 static inline u64 extent_map_end(struct extent_map *em)
@@ -38,9 +43,9 @@ static inline u64 extent_map_end(struct extent_map *em)
 
 static inline u64 extent_map_block_end(struct extent_map *em)
 {
-       if (em->block_start + em->len < em->block_start)
+       if (em->block_start + em->block_len < em->block_start)
                return (u64)-1;
-       return em->block_start + em->len;
+       return em->block_start + em->block_len;
 }
 
 void extent_map_tree_init(struct extent_map_tree *tree, gfp_t mask);
@@ -54,4 +59,7 @@ struct extent_map *alloc_extent_map(gfp_t mask);
 void free_extent_map(struct extent_map *em);
 int __init extent_map_init(void);
 void extent_map_exit(void);
+int unpin_extent_cache(struct extent_map_tree *tree, u64 start, u64 len);
+struct extent_map *search_extent_mapping(struct extent_map_tree *tree,
+                                        u64 start, u64 len);
 #endif