Merge branch 'fix/asoc' into for-linus

1 files changed, 1 insertions, 2 deletions

diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h
index ccc991c542df..57c3bb2884ce 100644
--- a/fs/btrfs/btrfs_inode.h
+++ b/fs/btrfs/btrfs_inode.h
@@ -136,9 +136,8 @@ struct btrfs_inode {
          * items we think we'll end up using, and reserved_extents is the number
          * of extent items we've reserved metadata for.
          */
-        spinlock_t accounting_lock;
         atomic_t outstanding_extents;
-        int reserved_extents;
+        atomic_t reserved_extents;
 
         /*
          * ordered_data_close is set by truncate when a file that used