Btrfs: update nodatacow code v2

[linux-2.6-block.git] / fs / btrfs / ordered-data.c

diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c
index b5745bb96d40ddfc34d7d3719c5c4ab5b04df790..e7317c8fda29abed50f5e84951d49f472673cf46 100644 (file)
--- a/fs/btrfs/ordered-data.c
+++ b/fs/btrfs/ordered-data.c
@@ -165,8 +165,7 @@ static inline struct rb_node *tree_search(struct btrfs_ordered_inode_tree *tree,
  * inserted.
  */
 int btrfs_add_ordered_extent(struct inode *inode, u64 file_offset,
-                            u64 start, u64 len, u64 disk_len, int nocow,
-                            int compressed)
+                            u64 start, u64 len, u64 disk_len, int type)
 {
        struct btrfs_ordered_inode_tree *tree;
        struct rb_node *node;
@@ -183,10 +182,8 @@ int btrfs_add_ordered_extent(struct inode *inode, u64 file_offset,
        entry->len = len;
        entry->disk_len = disk_len;
        entry->inode = inode;
-       if (nocow)
-               set_bit(BTRFS_ORDERED_NOCOW, &entry->flags);
-       if (compressed)
-               set_bit(BTRFS_ORDERED_COMPRESSED, &entry->flags);
+       if (type == BTRFS_ORDERED_NOCOW || type == BTRFS_ORDERED_COMPRESSED)
+               set_bit(type, &entry->flags);
 
        /* one ref for the tree */
        atomic_set(&entry->refs, 1);