Btrfs: convert the inode bit field to use the actual bit operations

Miao pointed this out while I was working on an orphan problem that messing
with a bitfield where different ranges are protected by different locks
doesn't work out right.  Turns out we've been doing this forever where we
have different parts of the bit field protected by either no lock at all or
different locks which could cause all sorts of weird problems including the
issue I was hitting.  So instead make a runtime_flags thing that we use the
normal bit operations on that are all atomic so we can keep having our
no/different locking for the different flags and then make force_compress
it's own thing so it can be treated normally.  Thanks,

Signed-off-by: Josef Bacik <josef@redhat.com>

1 files changed, 6 insertions, 5 deletions

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index 59ae191d4f93..1902726fa70a 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -4355,10 +4355,9 @@ static unsigned drop_outstanding_extent(struct inode *inode)
         BTRFS_I(inode)->outstanding_extents--;
 
         if (BTRFS_I(inode)->outstanding_extents == 0 &&
-            BTRFS_I(inode)->delalloc_meta_reserved) {
+            test_and_clear_bit(BTRFS_INODE_DELALLOC_META_RESERVED,
+                               &BTRFS_I(inode)->runtime_flags))
                 drop_inode_space = 1;
-                BTRFS_I(inode)->delalloc_meta_reserved = 0;
-        }
 
         /*
          * If we have more or the same amount of outsanding extents than we have
@@ -4465,7 +4464,8 @@ int btrfs_delalloc_reserve_metadata(struct inode *inode, u64 num_bytes)
          * Add an item to reserve for updating the inode when we complete the
          * delalloc io.
          */
-        if (!BTRFS_I(inode)->delalloc_meta_reserved) {
+        if (!test_bit(BTRFS_INODE_DELALLOC_META_RESERVED,
+                      &BTRFS_I(inode)->runtime_flags)) {
                 nr_extents++;
                 extra_reserve = 1;
         }
@@ -4511,7 +4511,8 @@ int btrfs_delalloc_reserve_metadata(struct inode *inode, u64 num_bytes)
 
         spin_lock(&BTRFS_I(inode)->lock);
         if (extra_reserve) {
-                BTRFS_I(inode)->delalloc_meta_reserved = 1;
+                set_bit(BTRFS_INODE_DELALLOC_META_RESERVED,
+                        &BTRFS_I(inode)->runtime_flags);
                 nr_extents--;
         }
         BTRFS_I(inode)->reserved_extents += nr_extents;