Btrfs: sort references by byte number during btrfs_inc_ref

[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 0eae6c4..fb6eeef 100644 (file)
--- a/fs/btrfs/extent_map.h
+++ b/fs/btrfs/extent_map.h
@@ -3,103 +3,60 @@
 
 #include <linux/rbtree.h>
 
+#define EXTENT_MAP_LAST_BYTE (u64)-4
+#define EXTENT_MAP_HOLE (u64)-3
 #define EXTENT_MAP_INLINE (u64)-2
 #define EXTENT_MAP_DELALLOC (u64)-1
 
-struct extent_map_ops {
-       int (*fill_delalloc)(struct inode *inode, u64 start, u64 end);
-       int (*writepage_io_hook)(struct page *page, u64 start, u64 end);
-       int (*readpage_io_hook)(struct page *page, u64 start, u64 end);
-       int (*readpage_end_io_hook)(struct page *page, u64 start, u64 end);
-};
-
-struct extent_map_tree {
-       struct rb_root map;
-       struct rb_root state;
-       struct address_space *mapping;
-       rwlock_t lock;
-       struct extent_map_ops *ops;
-};
+/* 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 */
 
-/* note, this must start with the same fields as fs/extent_map.c:tree_entry */
 struct extent_map {
-       u64 start;
-       u64 end; /* inclusive */
-       int in_tree;
        struct rb_node rb_node;
-       /* block_start and block_end are in bytes */
+
+       /* all of these are in bytes */
+       u64 start;
+       u64 len;
+       u64 orig_start;
        u64 block_start;
-       u64 block_end; /* inclusive */
+       u64 block_len;
+       unsigned long flags;
        struct block_device *bdev;
        atomic_t refs;
-};
-
-/* note, this must start with the same fields as fs/extent_map.c:tree_entry */
-struct extent_state {
-       u64 start;
-       u64 end; /* inclusive */
        int in_tree;
-       struct rb_node rb_node;
-       wait_queue_head_t wq;
-       atomic_t refs;
-       unsigned long state;
-
-       /* for use by the FS */
-       u64 private;
-
-       struct list_head list;
 };
 
-struct extent_buffer {
-       u64 start;
-       u64 end; /* inclusive */
-       char *addr;
-       struct page *pages[];
+struct extent_map_tree {
+       struct rb_root map;
+       spinlock_t lock;
 };
 
-typedef struct extent_map *(get_extent_t)(struct inode *inode,
-                                         struct page *page,
-                                         size_t page_offset,
-                                         u64 start, u64 end,
-                                         int create);
-
-void extent_map_tree_init(struct extent_map_tree *tree,
-                         struct address_space *mapping, gfp_t mask);
+static inline u64 extent_map_end(struct extent_map *em)
+{
+       if (em->start + em->len < em->start)
+               return (u64)-1;
+       return em->start + em->len;
+}
+
+static inline u64 extent_map_block_end(struct extent_map *em)
+{
+       if (em->block_start + em->block_len < em->block_start)
+               return (u64)-1;
+       return em->block_start + em->block_len;
+}
+
+void extent_map_tree_init(struct extent_map_tree *tree, gfp_t mask);
 struct extent_map *lookup_extent_mapping(struct extent_map_tree *tree,
-                                        u64 start, u64 end);
+                                        u64 start, u64 len);
 int add_extent_mapping(struct extent_map_tree *tree,
                       struct extent_map *em);
 int remove_extent_mapping(struct extent_map_tree *tree, struct extent_map *em);
-int try_release_extent_mapping(struct extent_map_tree *tree, struct page *page);
-int lock_extent(struct extent_map_tree *tree, u64 start, u64 end, gfp_t mask);
-int unlock_extent(struct extent_map_tree *tree, u64 start, u64 end, gfp_t mask);
+
 struct extent_map *alloc_extent_map(gfp_t mask);
 void free_extent_map(struct extent_map *em);
-int extent_read_full_page(struct extent_map_tree *tree, struct page *page,
-                         get_extent_t *get_extent);
-void __init extent_map_init(void);
-void __exit extent_map_exit(void);
-int extent_clean_all_trees(struct extent_map_tree *tree);
-int set_extent_uptodate(struct extent_map_tree *tree, u64 start, u64 end,
-                       gfp_t mask);
-int set_extent_new(struct extent_map_tree *tree, u64 start, u64 end,
-                  gfp_t mask);
-int set_extent_dirty(struct extent_map_tree *tree, u64 start, u64 end,
-                    gfp_t mask);
-int set_extent_delalloc(struct extent_map_tree *tree, u64 start, u64 end,
-                    gfp_t mask);
-int extent_invalidatepage(struct extent_map_tree *tree,
-                         struct page *page, unsigned long offset);
-int extent_write_full_page(struct extent_map_tree *tree, struct page *page,
-                         get_extent_t *get_extent,
-                         struct writeback_control *wbc);
-int extent_prepare_write(struct extent_map_tree *tree,
-                        struct inode *inode, struct page *page,
-                        unsigned from, unsigned to, get_extent_t *get_extent);
-int extent_commit_write(struct extent_map_tree *tree,
-                       struct inode *inode, struct page *page,
-                       unsigned from, unsigned to);
-int set_range_dirty(struct extent_map_tree *tree, u64 start, u64 end);
-int set_state_private(struct extent_map_tree *tree, u64 start, u64 private);
-int get_state_private(struct extent_map_tree *tree, u64 start, u64 *private);
+int __init extent_map_init(void);
+void extent_map_exit(void);
 #endif