diff options
author | Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> | 2007-10-16 18:38:25 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2007-10-17 18:50:02 -0400 |
commit | 308ba3ece7db82e8b8d32d6962e4d12e09c5aa41 (patch) | |
tree | 988a6a40329b2f22738560b2d56ca85f525cdee4 /include/linux/ext4_fs.h | |
parent | 6bc9feff14a2524c4bb2bac533dfd874b1533e20 (diff) |
ext4: Convert s_r_blocks_count and s_free_blocks_count
Convert s_r_blocks_count and s_free_blocks_count to
s_r_blocks_count_lo and s_free_blocks_count_lo
This helps in finding BUGs due to direct partial access of
these split 64 bit values
Also fix direct partial access in ext4 code
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'include/linux/ext4_fs.h')
-rw-r--r-- | include/linux/ext4_fs.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/ext4_fs.h b/include/linux/ext4_fs.h index d30d079a53e2..97dd409d5f4a 100644 --- a/include/linux/ext4_fs.h +++ b/include/linux/ext4_fs.h | |||
@@ -502,8 +502,8 @@ do { \ | |||
502 | struct ext4_super_block { | 502 | struct ext4_super_block { |
503 | /*00*/ __le32 s_inodes_count; /* Inodes count */ | 503 | /*00*/ __le32 s_inodes_count; /* Inodes count */ |
504 | __le32 s_blocks_count_lo; /* Blocks count */ | 504 | __le32 s_blocks_count_lo; /* Blocks count */ |
505 | __le32 s_r_blocks_count; /* Reserved blocks count */ | 505 | __le32 s_r_blocks_count_lo; /* Reserved blocks count */ |
506 | __le32 s_free_blocks_count; /* Free blocks count */ | 506 | __le32 s_free_blocks_count_lo; /* Free blocks count */ |
507 | /*10*/ __le32 s_free_inodes_count; /* Free inodes count */ | 507 | /*10*/ __le32 s_free_inodes_count; /* Free inodes count */ |
508 | __le32 s_first_data_block; /* First Data Block */ | 508 | __le32 s_first_data_block; /* First Data Block */ |
509 | __le32 s_log_block_size; /* Block size */ | 509 | __le32 s_log_block_size; /* Block size */ |
@@ -987,13 +987,13 @@ static inline ext4_fsblk_t ext4_blocks_count(struct ext4_super_block *es) | |||
987 | static inline ext4_fsblk_t ext4_r_blocks_count(struct ext4_super_block *es) | 987 | static inline ext4_fsblk_t ext4_r_blocks_count(struct ext4_super_block *es) |
988 | { | 988 | { |
989 | return ((ext4_fsblk_t)le32_to_cpu(es->s_r_blocks_count_hi) << 32) | | 989 | return ((ext4_fsblk_t)le32_to_cpu(es->s_r_blocks_count_hi) << 32) | |
990 | le32_to_cpu(es->s_r_blocks_count); | 990 | le32_to_cpu(es->s_r_blocks_count_lo); |
991 | } | 991 | } |
992 | 992 | ||
993 | static inline ext4_fsblk_t ext4_free_blocks_count(struct ext4_super_block *es) | 993 | static inline ext4_fsblk_t ext4_free_blocks_count(struct ext4_super_block *es) |
994 | { | 994 | { |
995 | return ((ext4_fsblk_t)le32_to_cpu(es->s_free_blocks_count_hi) << 32) | | 995 | return ((ext4_fsblk_t)le32_to_cpu(es->s_free_blocks_count_hi) << 32) | |
996 | le32_to_cpu(es->s_free_blocks_count); | 996 | le32_to_cpu(es->s_free_blocks_count_lo); |
997 | } | 997 | } |
998 | 998 | ||
999 | static inline void ext4_blocks_count_set(struct ext4_super_block *es, | 999 | static inline void ext4_blocks_count_set(struct ext4_super_block *es, |
@@ -1006,14 +1006,14 @@ static inline void ext4_blocks_count_set(struct ext4_super_block *es, | |||
1006 | static inline void ext4_free_blocks_count_set(struct ext4_super_block *es, | 1006 | static inline void ext4_free_blocks_count_set(struct ext4_super_block *es, |
1007 | ext4_fsblk_t blk) | 1007 | ext4_fsblk_t blk) |
1008 | { | 1008 | { |
1009 | es->s_free_blocks_count = cpu_to_le32((u32)blk); | 1009 | es->s_free_blocks_count_lo = cpu_to_le32((u32)blk); |
1010 | es->s_free_blocks_count_hi = cpu_to_le32(blk >> 32); | 1010 | es->s_free_blocks_count_hi = cpu_to_le32(blk >> 32); |
1011 | } | 1011 | } |
1012 | 1012 | ||
1013 | static inline void ext4_r_blocks_count_set(struct ext4_super_block *es, | 1013 | static inline void ext4_r_blocks_count_set(struct ext4_super_block *es, |
1014 | ext4_fsblk_t blk) | 1014 | ext4_fsblk_t blk) |
1015 | { | 1015 | { |
1016 | es->s_r_blocks_count = cpu_to_le32((u32)blk); | 1016 | es->s_r_blocks_count_lo = cpu_to_le32((u32)blk); |
1017 | es->s_r_blocks_count_hi = cpu_to_le32(blk >> 32); | 1017 | es->s_r_blocks_count_hi = cpu_to_le32(blk >> 32); |
1018 | } | 1018 | } |
1019 | 1019 | ||