diff options
Diffstat (limited to 'fs/ocfs2/inode.h')
-rw-r--r-- | fs/ocfs2/inode.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/fs/ocfs2/inode.h b/fs/ocfs2/inode.h index 621fc73bf23d..a6c991c0fc98 100644 --- a/fs/ocfs2/inode.h +++ b/fs/ocfs2/inode.h | |||
@@ -44,7 +44,7 @@ struct ocfs2_inode_info | |||
44 | struct rw_semaphore ip_xattr_sem; | 44 | struct rw_semaphore ip_xattr_sem; |
45 | 45 | ||
46 | /* Number of outstanding AIO's which are not page aligned */ | 46 | /* Number of outstanding AIO's which are not page aligned */ |
47 | atomic_t ip_unaligned_aio; | 47 | struct mutex ip_unaligned_aio; |
48 | 48 | ||
49 | /* These fields are protected by ip_lock */ | 49 | /* These fields are protected by ip_lock */ |
50 | spinlock_t ip_lock; | 50 | spinlock_t ip_lock; |
@@ -73,6 +73,13 @@ struct ocfs2_inode_info | |||
73 | u32 ip_dir_lock_gen; | 73 | u32 ip_dir_lock_gen; |
74 | 74 | ||
75 | struct ocfs2_alloc_reservation ip_la_data_resv; | 75 | struct ocfs2_alloc_reservation ip_la_data_resv; |
76 | |||
77 | /* | ||
78 | * Transactions that contain inode's metadata needed to complete | ||
79 | * fsync and fdatasync, respectively. | ||
80 | */ | ||
81 | tid_t i_sync_tid; | ||
82 | tid_t i_datasync_tid; | ||
76 | }; | 83 | }; |
77 | 84 | ||
78 | /* | 85 | /* |
@@ -84,8 +91,6 @@ struct ocfs2_inode_info | |||
84 | #define OCFS2_INODE_BITMAP 0x00000004 | 91 | #define OCFS2_INODE_BITMAP 0x00000004 |
85 | /* This inode has been wiped from disk */ | 92 | /* This inode has been wiped from disk */ |
86 | #define OCFS2_INODE_DELETED 0x00000008 | 93 | #define OCFS2_INODE_DELETED 0x00000008 |
87 | /* Another node is deleting, so our delete is a nop */ | ||
88 | #define OCFS2_INODE_SKIP_DELETE 0x00000010 | ||
89 | /* Has the inode been orphaned on another node? | 94 | /* Has the inode been orphaned on another node? |
90 | * | 95 | * |
91 | * This hints to ocfs2_drop_inode that it should clear i_nlink before | 96 | * This hints to ocfs2_drop_inode that it should clear i_nlink before |
@@ -100,11 +105,11 @@ struct ocfs2_inode_info | |||
100 | * rely on ocfs2_delete_inode to sort things out under the proper | 105 | * rely on ocfs2_delete_inode to sort things out under the proper |
101 | * cluster locks. | 106 | * cluster locks. |
102 | */ | 107 | */ |
103 | #define OCFS2_INODE_MAYBE_ORPHANED 0x00000020 | 108 | #define OCFS2_INODE_MAYBE_ORPHANED 0x00000010 |
104 | /* Does someone have the file open O_DIRECT */ | 109 | /* Does someone have the file open O_DIRECT */ |
105 | #define OCFS2_INODE_OPEN_DIRECT 0x00000040 | 110 | #define OCFS2_INODE_OPEN_DIRECT 0x00000020 |
106 | /* Tell the inode wipe code it's not in orphan dir */ | 111 | /* Tell the inode wipe code it's not in orphan dir */ |
107 | #define OCFS2_INODE_SKIP_ORPHAN_DIR 0x00000080 | 112 | #define OCFS2_INODE_SKIP_ORPHAN_DIR 0x00000040 |
108 | 113 | ||
109 | static inline struct ocfs2_inode_info *OCFS2_I(struct inode *inode) | 114 | static inline struct ocfs2_inode_info *OCFS2_I(struct inode *inode) |
110 | { | 115 | { |