btrfs: move simple extent bit helpers out of extent_io.c

These are just variants and wrappers around the actual work horses of
the extent state.  Extract these out of extent_io.c.

Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/extent-io-tree.c b/fs/btrfs/extent-io-tree.c
index 2aedac4..4688f67 100644 (file)
--- a/fs/btrfs/extent-io-tree.c
+++ b/fs/btrfs/extent-io-tree.c
@@ -142,6 +142,51 @@ void free_extent_state(struct extent_state *state)
        }
 }
 
+/* Wrappers around set/clear extent bit */
+int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
+                          u32 bits, struct extent_changeset *changeset)
+{
+       /*
+        * We don't support EXTENT_LOCKED yet, as current changeset will
+        * record any bits changed, so for EXTENT_LOCKED case, it will
+        * either fail with -EEXIST or changeset will record the whole
+        * range.
+        */
+       ASSERT(!(bits & EXTENT_LOCKED));
+
+       return set_extent_bit(tree, start, end, bits, 0, NULL, NULL, GFP_NOFS,
+                             changeset);
+}
+
+int clear_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
+                            u32 bits, struct extent_changeset *changeset)
+{
+       /*
+        * Don't support EXTENT_LOCKED case, same reason as
+        * set_record_extent_bits().
+        */
+       ASSERT(!(bits & EXTENT_LOCKED));
+
+       return __clear_extent_bit(tree, start, end, bits, 0, 0, NULL, GFP_NOFS,
+                                 changeset);
+}
+
+int try_lock_extent(struct extent_io_tree *tree, u64 start, u64 end)
+{
+       int err;
+       u64 failed_start;
+
+       err = set_extent_bit(tree, start, end, EXTENT_LOCKED, EXTENT_LOCKED,
+                            &failed_start, NULL, GFP_NOFS, NULL);
+       if (err == -EEXIST) {
+               if (failed_start > start)
+                       clear_extent_bit(tree, start, failed_start - 1,
+                                        EXTENT_LOCKED, 1, 0, NULL);
+               return 0;
+       }
+       return 1;
+}
+
 void __cold extent_state_free_cachep(void)
 {
        btrfs_extent_state_leak_debug_check();

diff --git a/fs/btrfs/extent-io-tree.h b/fs/btrfs/extent-io-tree.h
index 56266e7..16a9da4 100644 (file)
--- a/fs/btrfs/extent-io-tree.h
+++ b/fs/btrfs/extent-io-tree.h
@@ -120,14 +120,19 @@ int test_range_bit(struct extent_io_tree *tree, u64 start, u64 end,
                   u32 bits, int filled, struct extent_state *cached_state);
 int clear_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
                             u32 bits, struct extent_changeset *changeset);
-int clear_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
-                    u32 bits, int wake, int delete,
-                    struct extent_state **cached);
 int __clear_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
                     u32 bits, int wake, int delete,
                     struct extent_state **cached, gfp_t mask,
                     struct extent_changeset *changeset);
 
+static inline int clear_extent_bit(struct extent_io_tree *tree, u64 start,
+                                  u64 end, u32 bits, int wake, int delete,
+                                  struct extent_state **cached)
+{
+       return __clear_extent_bit(tree, start, end, bits, wake, delete,
+                                 cached, GFP_NOFS, NULL);
+}
+
 static inline int unlock_extent(struct extent_io_tree *tree, u64 start, u64 end)
 {
        return clear_extent_bit(tree, start, end, EXTENT_LOCKED, 1, 0, NULL);
@@ -164,8 +169,13 @@ int set_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
                   u32 bits, unsigned exclusive_bits, u64 *failed_start,
                   struct extent_state **cached_state, gfp_t mask,
                   struct extent_changeset *changeset);
-int set_extent_bits_nowait(struct extent_io_tree *tree, u64 start, u64 end,
-                          u32 bits);
+
+static inline int set_extent_bits_nowait(struct extent_io_tree *tree, u64 start,
+                                        u64 end, u32 bits)
+{
+       return set_extent_bit(tree, start, end, bits, 0, NULL, NULL,
+                             GFP_NOWAIT, NULL);
+}
 
 static inline int set_extent_bits(struct extent_io_tree *tree, u64 start,
                u64 end, u32 bits)

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index c600428..3c57832 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -1283,50 +1283,6 @@ out:
        return err;
 }
 
-/* wrappers around set/clear extent bit */
-int set_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
-                          u32 bits, struct extent_changeset *changeset)
-{
-       /*
-        * We don't support EXTENT_LOCKED yet, as current changeset will
-        * record any bits changed, so for EXTENT_LOCKED case, it will
-        * either fail with -EEXIST or changeset will record the whole
-        * range.
-        */
-       ASSERT(!(bits & EXTENT_LOCKED));
-
-       return set_extent_bit(tree, start, end, bits, 0, NULL, NULL, GFP_NOFS,
-                             changeset);
-}
-
-int set_extent_bits_nowait(struct extent_io_tree *tree, u64 start, u64 end,
-                          u32 bits)
-{
-       return set_extent_bit(tree, start, end, bits, 0, NULL, NULL,
-                             GFP_NOWAIT, NULL);
-}
-
-int clear_extent_bit(struct extent_io_tree *tree, u64 start, u64 end,
-                    u32 bits, int wake, int delete,
-                    struct extent_state **cached)
-{
-       return __clear_extent_bit(tree, start, end, bits, wake, delete,
-                                 cached, GFP_NOFS, NULL);
-}
-
-int clear_record_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
-               u32 bits, struct extent_changeset *changeset)
-{
-       /*
-        * Don't support EXTENT_LOCKED case, same reason as
-        * set_record_extent_bits().
-        */
-       ASSERT(!(bits & EXTENT_LOCKED));
-
-       return __clear_extent_bit(tree, start, end, bits, 0, 0, NULL, GFP_NOFS,
-                                 changeset);
-}
-
 /*
  * either insert or lock state struct between start and end use mask to tell
  * us if waiting is desired.
@@ -1351,22 +1307,6 @@ int lock_extent_bits(struct extent_io_tree *tree, u64 start, u64 end,
        return err;
 }
 
-int try_lock_extent(struct extent_io_tree *tree, u64 start, u64 end)
-{
-       int err;
-       u64 failed_start;
-
-       err = set_extent_bit(tree, start, end, EXTENT_LOCKED, EXTENT_LOCKED,
-                            &failed_start, NULL, GFP_NOFS, NULL);
-       if (err == -EEXIST) {
-               if (failed_start > start)
-                       clear_extent_bit(tree, start, failed_start - 1,
-                                        EXTENT_LOCKED, 1, 0, NULL);
-               return 0;
-       }
-       return 1;
-}
-
 void extent_range_clear_dirty_for_io(struct inode *inode, u64 start, u64 end)
 {
        unsigned long index = start >> PAGE_SHIFT;