Merge tag 'upstream-3.15-rc1' of git://git.infradead.org/linux-ubifs

[karo-tx-linux.git] / fs / ocfs2 / inode.h

diff --git a/fs/ocfs2/inode.h b/fs/ocfs2/inode.h
index 621fc73bf23de3f58ae331e8d7109b23d80e039e..a6c991c0fc98cf413a846ff75c1edf62c1348fcd 100644 (file)
--- a/fs/ocfs2/inode.h
+++ b/fs/ocfs2/inode.h
@@ -44,7 +44,7 @@ struct ocfs2_inode_info
        struct rw_semaphore             ip_xattr_sem;
 
        /* Number of outstanding AIO's which are not page aligned */
-       atomic_t                        ip_unaligned_aio;
+       struct mutex                    ip_unaligned_aio;
 
        /* These fields are protected by ip_lock */
        spinlock_t                      ip_lock;
@@ -73,6 +73,13 @@ struct ocfs2_inode_info
        u32                             ip_dir_lock_gen;
 
        struct ocfs2_alloc_reservation  ip_la_data_resv;
+
+       /*
+        * Transactions that contain inode's metadata needed to complete
+        * fsync and fdatasync, respectively.
+        */
+       tid_t i_sync_tid;
+       tid_t i_datasync_tid;
 };
 
 /*
@@ -84,8 +91,6 @@ struct ocfs2_inode_info
 #define OCFS2_INODE_BITMAP             0x00000004
 /* This inode has been wiped from disk */
 #define OCFS2_INODE_DELETED            0x00000008
-/* Another node is deleting, so our delete is a nop */
-#define OCFS2_INODE_SKIP_DELETE                0x00000010
 /* Has the inode been orphaned on another node?
  *
  * This hints to ocfs2_drop_inode that it should clear i_nlink before
@@ -100,11 +105,11 @@ struct ocfs2_inode_info
  * rely on ocfs2_delete_inode to sort things out under the proper
  * cluster locks.
  */
-#define OCFS2_INODE_MAYBE_ORPHANED     0x00000020
+#define OCFS2_INODE_MAYBE_ORPHANED     0x00000010
 /* Does someone have the file open O_DIRECT */
-#define OCFS2_INODE_OPEN_DIRECT                0x00000040
+#define OCFS2_INODE_OPEN_DIRECT                0x00000020
 /* Tell the inode wipe code it's not in orphan dir */
-#define OCFS2_INODE_SKIP_ORPHAN_DIR     0x00000080
+#define OCFS2_INODE_SKIP_ORPHAN_DIR     0x00000040
 
 static inline struct ocfs2_inode_info *OCFS2_I(struct inode *inode)
 {