btrfs: open code set_extent_dirty

The helper is used a few times, that it's setting the DIRTY extent bit
is still clear.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c
index 590b0356026505cc0bdb547d1b56820e747af427..ec463f8d83ecfd28e281cbb770399a858bfb4339 100644 (file)
--- a/fs/btrfs/block-group.c
+++ b/fs/btrfs/block-group.c
@@ -3521,9 +3521,10 @@ int btrfs_update_block_group(struct btrfs_trans_handle *trans,
                        spin_unlock(&cache->lock);
                        spin_unlock(&space_info->lock);
 
-                       set_extent_dirty(&trans->transaction->pinned_extents,
-                                        bytenr, bytenr + num_bytes - 1,
-                                        GFP_NOFS | __GFP_NOFAIL);
+                       set_extent_bit(&trans->transaction->pinned_extents,
+                                      bytenr, bytenr + num_bytes - 1,
+                                      EXTENT_DIRTY, NULL,
+                                      GFP_NOFS | __GFP_NOFAIL);
                }
 
                spin_lock(&trans->transaction->dirty_bgs_lock);

diff --git a/fs/btrfs/extent-io-tree.h b/fs/btrfs/extent-io-tree.h
index 293e493771041ce8f47387b6189d03f6efee27db..0fc54546a63df7b31621ef6cf8597e27cf3a3c7a 100644 (file)
--- a/fs/btrfs/extent-io-tree.h
+++ b/fs/btrfs/extent-io-tree.h
@@ -175,12 +175,6 @@ static inline int clear_extent_uptodate(struct extent_io_tree *tree, u64 start,
                                  cached_state, GFP_NOFS, NULL);
 }
 
-static inline int set_extent_dirty(struct extent_io_tree *tree, u64 start,
-               u64 end, gfp_t mask)
-{
-       return set_extent_bit(tree, start, end, EXTENT_DIRTY, NULL, mask);
-}
-
 static inline int clear_extent_dirty(struct extent_io_tree *tree, u64 start,
                                     u64 end, struct extent_state **cached)
 {

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 5c7c72042193ab0b8b800b1e1d37864416d48272..47cfb694cdbf7fde4edf370de093c0fc16214f0e 100644 (file)
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -2507,8 +2507,9 @@ static int pin_down_extent(struct btrfs_trans_handle *trans,
        spin_unlock(&cache->lock);
        spin_unlock(&cache->space_info->lock);
 
-       set_extent_dirty(&trans->transaction->pinned_extents, bytenr,
-                        bytenr + num_bytes - 1, GFP_NOFS | __GFP_NOFAIL);
+       set_extent_bit(&trans->transaction->pinned_extents, bytenr,
+                      bytenr + num_bytes - 1, EXTENT_DIRTY, NULL,
+                      GFP_NOFS | __GFP_NOFAIL);
        return 0;
 }
 
@@ -4829,16 +4830,18 @@ btrfs_init_new_buffer(struct btrfs_trans_handle *trans, struct btrfs_root *root,
                 * EXTENT bit to differentiate dirty pages.
                 */
                if (buf->log_index == 0)
-                       set_extent_dirty(&root->dirty_log_pages, buf->start,
-                                       buf->start + buf->len - 1, GFP_NOFS);
+                       set_extent_bit(&root->dirty_log_pages, buf->start,
+                                      buf->start + buf->len - 1,
+                                      EXTENT_DIRTY, NULL, GFP_NOFS);
                else
                        set_extent_bit(&root->dirty_log_pages, buf->start,
                                       buf->start + buf->len - 1,
                                       EXTENT_NEW, NULL, GFP_NOFS);
        } else {
                buf->log_index = -1;
-               set_extent_dirty(&trans->transaction->dirty_pages, buf->start,
-                        buf->start + buf->len - 1, GFP_NOFS);
+               set_extent_bit(&trans->transaction->dirty_pages, buf->start,
+                              buf->start + buf->len - 1, EXTENT_DIRTY, NULL,
+                              GFP_NOFS);
        }
        /* this returns a buffer locked for blocking */
        return buf;