Btrfs: switch extent_map to a rw lock

[net-next-2.6.git] / fs / btrfs / extent_map.h

diff --git a/fs/btrfs/extent_map.h b/fs/btrfs/extent_map.h
index 56314217cfc0639aee6d40906df6523a3ac43563..6216dfbcf9be7a195632d733248b1cb766c6139e 100644 (file)
--- a/fs/btrfs/extent_map.h
+++ b/fs/btrfs/extent_map.h
@@ -8,13 +8,21 @@
 #define EXTENT_MAP_INLINE (u64)-2
 #define EXTENT_MAP_DELALLOC (u64)-1
 
+/* 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;
 
        /* 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;
@@ -23,8 +31,7 @@ struct extent_map {
 
 struct extent_map_tree {
        struct rb_root map;
-       struct extent_map *last;
-       spinlock_t lock;
+       rwlock_t lock;
 };
 
 static inline u64 extent_map_end(struct extent_map *em)
@@ -36,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);