diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-03 03:15:35 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-03 03:15:35 -0500 |
| commit | b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15 (patch) | |
| tree | 99e5b423473097756353d038f922b2623f3edd2a /fs/ext4/ext4.h | |
| parent | 1bded710a574f20d41bc9e7fb531301db282d623 (diff) | |
| parent | fb53fde9762432d091dac209bdf4f3f850117c55 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/Kconfig
Diffstat (limited to 'fs/ext4/ext4.h')
| -rw-r--r-- | fs/ext4/ext4.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index c668e4377d76..aafc9eba1c25 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h | |||
| @@ -1206,8 +1206,11 @@ static inline void ext4_r_blocks_count_set(struct ext4_super_block *es, | |||
| 1206 | 1206 | ||
| 1207 | static inline loff_t ext4_isize(struct ext4_inode *raw_inode) | 1207 | static inline loff_t ext4_isize(struct ext4_inode *raw_inode) |
| 1208 | { | 1208 | { |
| 1209 | return ((loff_t)le32_to_cpu(raw_inode->i_size_high) << 32) | | 1209 | if (S_ISREG(le16_to_cpu(raw_inode->i_mode))) |
| 1210 | le32_to_cpu(raw_inode->i_size_lo); | 1210 | return ((loff_t)le32_to_cpu(raw_inode->i_size_high) << 32) | |
| 1211 | le32_to_cpu(raw_inode->i_size_lo); | ||
| 1212 | else | ||
| 1213 | return (loff_t) le32_to_cpu(raw_inode->i_size_lo); | ||
| 1211 | } | 1214 | } |
| 1212 | 1215 | ||
| 1213 | static inline void ext4_isize_set(struct ext4_inode *raw_inode, loff_t i_size) | 1216 | static inline void ext4_isize_set(struct ext4_inode *raw_inode, loff_t i_size) |