Btrfs: fix btrfs_unlock_up_safe to walk the entire path

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

diff --git a/fs/btrfs/ordered-data.h b/fs/btrfs/ordered-data.h
index 8e8e3c0..ab66d5e 100644 (file)
--- a/fs/btrfs/ordered-data.h
+++ b/fs/btrfs/ordered-data.h
@@ -33,20 +33,22 @@ struct btrfs_ordered_inode_tree {
  * the ordered extent are on disk
  */
 struct btrfs_sector_sum {
-       u64 offset;
+       /* bytenr on disk */
+       u64 bytenr;
        u32 sum;
 };
 
 struct btrfs_ordered_sum {
-       u64 file_offset;
+       /* bytenr is the start of this extent on disk */
+       u64 bytenr;
+
        /*
         * this is the length in bytes covered by the sums array below.
-        * But, the sums array may not be contiguous in the file.
         */
        unsigned long len;
        struct list_head list;
        /* last field is a variable length array of btrfs_sector_sums */
-       struct btrfs_sector_sum sums;
+       struct btrfs_sector_sum sums[];
 };
 
 /*
@@ -64,6 +66,12 @@ struct btrfs_ordered_sum {
 
 #define BTRFS_ORDERED_COMPLETE 1 /* set when removed from the tree */
 
+#define BTRFS_ORDERED_NOCOW 2 /* set when we want to write in place */
+
+#define BTRFS_ORDERED_COMPRESSED 3 /* writing a compressed extent */
+
+#define BTRFS_ORDERED_PREALLOC 4 /* set when writing to prealloced extent */
+
 struct btrfs_ordered_extent {
        /* logical offset in the file */
        u64 file_offset;
@@ -71,15 +79,21 @@ struct btrfs_ordered_extent {
        /* disk byte number */
        u64 start;
 
-       /* length of the extent in bytes */
+       /* ram length of the extent in bytes */
        u64 len;
 
+       /* extent length on disk */
+       u64 disk_len;
+
        /* flags (described above) */
        unsigned long flags;
 
        /* reference count */
        atomic_t refs;
 
+       /* the inode we belong to */
+       struct inode *inode;
+
        /* list of checksums for insertion when the extent io is done */
        struct list_head list;
 
@@ -88,6 +102,9 @@ struct btrfs_ordered_extent {
 
        /* our friendly rbtree entry */
        struct rb_node rb_node;
+
+       /* a per root list of all the pending ordered extents */
+       struct list_head root_extent_list;
 };
 
 
@@ -95,7 +112,8 @@ struct btrfs_ordered_extent {
  * calculates the total size you need to allocate for an ordered sum
  * structure spanning 'bytes' in the file
  */
-static inline int btrfs_ordered_sum_size(struct btrfs_root *root, u64 bytes)
+static inline int btrfs_ordered_sum_size(struct btrfs_root *root,
+                                        unsigned long bytes)
 {
        unsigned long num_sectors = (bytes + root->sectorsize - 1) /
                root->sectorsize;
@@ -118,7 +136,7 @@ int btrfs_remove_ordered_extent(struct inode *inode,
 int btrfs_dec_test_ordered_pending(struct inode *inode,
                                       u64 file_offset, u64 io_size);
 int btrfs_add_ordered_extent(struct inode *inode, u64 file_offset,
-                            u64 start, u64 len);
+                            u64 start, u64 len, u64 disk_len, int tyep);
 int btrfs_add_ordered_sum(struct inode *inode,
                          struct btrfs_ordered_extent *entry,
                          struct btrfs_ordered_sum *sum);
@@ -126,14 +144,15 @@ struct btrfs_ordered_extent *btrfs_lookup_ordered_extent(struct inode *inode,
                                                         u64 file_offset);
 void btrfs_start_ordered_extent(struct inode *inode,
                                struct btrfs_ordered_extent *entry, int wait);
-void btrfs_wait_ordered_range(struct inode *inode, u64 start, u64 len);
+int btrfs_wait_ordered_range(struct inode *inode, u64 start, u64 len);
 struct btrfs_ordered_extent *
 btrfs_lookup_first_ordered_extent(struct inode * inode, u64 file_offset);
 int btrfs_ordered_update_i_size(struct inode *inode,
                                struct btrfs_ordered_extent *ordered);
-int btrfs_find_ordered_sum(struct inode *inode, u64 offset, u32 *sum);
+int btrfs_find_ordered_sum(struct inode *inode, u64 offset, u64 disk_bytenr, u32 *sum);
 int btrfs_wait_on_page_writeback_range(struct address_space *mapping,
                                       pgoff_t start, pgoff_t end);
 int btrfs_fdatawrite_range(struct address_space *mapping, loff_t start,
                           loff_t end, int sync_mode);
+int btrfs_wait_ordered_extents(struct btrfs_root *root, int nocow_only);
 #endif