diff options
author | Eric W. Biederman | 2009-11-17 10:01:34 +0100 |
---|---|---|
committer | Eric W. Biederman | 2009-11-17 10:01:34 +0100 |
commit | bb9074ff58fe745e4f244f76209241909c82ec9c (patch) | |
tree | cf6be00ab88b1e315f6b74a896a370440f677599 /include/linux/ext3_fs_i.h | |
parent | sysctl: Remove the last of the generic binary sysctl support (diff) | |
parent | Linux 2.6.32-rc7 (diff) | |
download | kernel-qcow2-linux-bb9074ff58fe745e4f244f76209241909c82ec9c.tar.gz kernel-qcow2-linux-bb9074ff58fe745e4f244f76209241909c82ec9c.tar.xz kernel-qcow2-linux-bb9074ff58fe745e4f244f76209241909c82ec9c.zip |
Merge commit 'v2.6.32-rc7'
Resolve the conflict between v2.6.32-rc7 where dn_def_dev_handler
gets a small bug fix and the sysctl tree where I am removing all
sysctl strategy routines.
Diffstat (limited to 'include/linux/ext3_fs_i.h')
-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; }; |