diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-02 13:06:20 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-02 13:06:20 -0400 |
commit | f1f8935a5c38a2c61e86a42bc971a2539eef2211 (patch) | |
tree | 694950045f2f5d89507d7206cf6595e09cdfbd2c /include/linux/fs.h | |
parent | 34116645d912f65d7eb4508a1db3c9d0e45facb1 (diff) | |
parent | f2a44523b20f323e4aef7c16261d34d6f0a4bf06 (diff) |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (97 commits)
jbd2: Unify log messages in jbd2 code
jbd/jbd2: validate sb->s_first in journal_get_superblock()
ext4: let ext4_ext_rm_leaf work with EXT_DEBUG defined
ext4: fix a syntax error in ext4_ext_insert_extent when debugging enabled
ext4: fix a typo in struct ext4_allocation_context
ext4: Don't normalize an falloc request if it can fit in 1 extent.
ext4: remove comments about extent mount option in ext4_new_inode()
ext4: let ext4_discard_partial_buffers handle unaligned range correctly
ext4: return ENOMEM if find_or_create_pages fails
ext4: move vars to local scope in ext4_discard_partial_page_buffers_no_lock()
ext4: Create helper function for EXT4_IO_END_UNWRITTEN and i_aiodio_unwritten
ext4: optimize locking for end_io extent conversion
ext4: remove unnecessary call to waitqueue_active()
ext4: Use correct locking for ext4_end_io_nolock()
ext4: fix race in xattr block allocation path
ext4: trace punch_hole correctly in ext4_ext_map_blocks
ext4: clean up AGGRESSIVE_TEST code
ext4: move variables to their scope
ext4: fix quota accounting during migration
ext4: migrate cleanup
...
Diffstat (limited to 'include/linux/fs.h')
-rw-r--r-- | include/linux/fs.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 7a049fd2aa4c..78af9385f415 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -770,12 +770,13 @@ struct inode { | |||
770 | unsigned long i_ino; | 770 | unsigned long i_ino; |
771 | unsigned int i_nlink; | 771 | unsigned int i_nlink; |
772 | dev_t i_rdev; | 772 | dev_t i_rdev; |
773 | loff_t i_size; | ||
774 | struct timespec i_atime; | 773 | struct timespec i_atime; |
775 | struct timespec i_mtime; | 774 | struct timespec i_mtime; |
776 | struct timespec i_ctime; | 775 | struct timespec i_ctime; |
777 | unsigned int i_blkbits; | 776 | spinlock_t i_lock; /* i_blocks, i_bytes, maybe i_size */ |
777 | unsigned short i_bytes; | ||
778 | blkcnt_t i_blocks; | 778 | blkcnt_t i_blocks; |
779 | loff_t i_size; | ||
779 | 780 | ||
780 | #ifdef __NEED_I_SIZE_ORDERED | 781 | #ifdef __NEED_I_SIZE_ORDERED |
781 | seqcount_t i_size_seqcount; | 782 | seqcount_t i_size_seqcount; |
@@ -783,7 +784,6 @@ struct inode { | |||
783 | 784 | ||
784 | /* Misc */ | 785 | /* Misc */ |
785 | unsigned long i_state; | 786 | unsigned long i_state; |
786 | spinlock_t i_lock; /* i_blocks, i_bytes, maybe i_size */ | ||
787 | struct mutex i_mutex; | 787 | struct mutex i_mutex; |
788 | 788 | ||
789 | unsigned long dirtied_when; /* jiffies of first dirtying */ | 789 | unsigned long dirtied_when; /* jiffies of first dirtying */ |
@@ -797,9 +797,10 @@ struct inode { | |||
797 | struct rcu_head i_rcu; | 797 | struct rcu_head i_rcu; |
798 | }; | 798 | }; |
799 | atomic_t i_count; | 799 | atomic_t i_count; |
800 | unsigned int i_blkbits; | ||
800 | u64 i_version; | 801 | u64 i_version; |
801 | unsigned short i_bytes; | ||
802 | atomic_t i_dio_count; | 802 | atomic_t i_dio_count; |
803 | atomic_t i_writecount; | ||
803 | const struct file_operations *i_fop; /* former ->i_op->default_file_ops */ | 804 | const struct file_operations *i_fop; /* former ->i_op->default_file_ops */ |
804 | struct file_lock *i_flock; | 805 | struct file_lock *i_flock; |
805 | struct address_space i_data; | 806 | struct address_space i_data; |
@@ -823,7 +824,6 @@ struct inode { | |||
823 | #ifdef CONFIG_IMA | 824 | #ifdef CONFIG_IMA |
824 | atomic_t i_readcount; /* struct files open RO */ | 825 | atomic_t i_readcount; /* struct files open RO */ |
825 | #endif | 826 | #endif |
826 | atomic_t i_writecount; | ||
827 | void *i_private; /* fs or device private pointer */ | 827 | void *i_private; /* fs or device private pointer */ |
828 | }; | 828 | }; |
829 | 829 | ||