diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-11 22:52:22 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-11 22:52:22 +0300 |
| commit | fd801452a30927ec0dff84e541191e611c1afd0c (patch) | |
| tree | 3c83a39d2870694729a84db9fa4d028ee496b3a2 /include/linux | |
| parent | 79a8f1b1a481cc28701275de916ccea954c6743f (diff) | |
| parent | 7b02bec07efe1d6c7d48c786e0c1a38d28fe7245 (diff) | |
| download | linux-fd801452a30927ec0dff84e541191e611c1afd0c.tar.xz | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
JBD/JBD2: free j_wbuf if journal init fails.
ext3: Wait for proper transaction commit on fsync
ext3: retry failed direct IO allocations
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ext3_fs_i.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/ext3_fs_i.h b/include/linux/ext3_fs_i.h index ca1bfe90004f..93e7428156ba 100644 --- a/include/linux/ext3_fs_i.h +++ b/include/linux/ext3_fs_i.h @@ -137,6 +137,14 @@ struct ext3_inode_info { * by other means, so we have truncate_mutex. */ struct mutex truncate_mutex; + + /* + * Transactions that contain inode's metadata needed to complete + * fsync and fdatasync, respectively. + */ + atomic_t i_sync_tid; + atomic_t i_datasync_tid; + struct inode vfs_inode; }; |