1 files changed, 17 insertions, 6 deletions

diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h
index 6ad63f17eca0..52d7eca8c7bf 100644
--- a/fs/btrfs/btrfs_inode.h
+++ b/fs/btrfs/btrfs_inode.h
@@ -22,6 +22,7 @@
 #include "extent_map.h"
 #include "extent_io.h"
 #include "ordered-data.h"
+#include "delayed-inode.h"
 
 /* in memory btrfs inode */
 struct btrfs_inode {
@@ -120,9 +121,6 @@ struct btrfs_inode {
          */
         u64 index_cnt;
 
-        /* the start of block group preferred for allocations. */
-        u64 block_group;
-
         /* the fsync log has some corner cases that mean we have to check
          * directories to see if any unlinks have been done before
          * the directory was logged.  See tree-log.c for all the
@@ -136,9 +134,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
@@ -153,20 +150,34 @@ struct btrfs_inode {
         unsigned ordered_data_close:1;
         unsigned orphan_meta_reserved:1;
         unsigned dummy_inode:1;
+        unsigned in_defrag:1;
 
         /*
          * always compress this one file
          */
-        unsigned force_compress:1;
+        unsigned force_compress:4;
+
+        struct btrfs_delayed_node *delayed_node;
 
         struct inode vfs_inode;
 };
 
+extern unsigned char btrfs_filetype_table[];
+
 static inline struct btrfs_inode *BTRFS_I(struct inode *inode)
 {
         return container_of(inode, struct btrfs_inode, vfs_inode);
 }
 
+static inline u64 btrfs_ino(struct inode *inode)
+{
+        u64 ino = BTRFS_I(inode)->location.objectid;
+
+        if (ino <= BTRFS_FIRST_FREE_OBJECTID)
+                ino = inode->i_ino;
+        return ino;
+}
+
 static inline void btrfs_i_size_write(struct inode *inode, u64 size)
 {
         i_size_write(inode, size);