diff options
-rw-r--r-- | fs/ext4/extents.c | 2 | ||||
-rw-r--r-- | fs/ext4/move_extent.c | 5 | ||||
-rw-r--r-- | fs/ext4/super.c | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index cbcc6b3f2ae0..8f08c7b77179 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c | |||
@@ -1177,7 +1177,7 @@ static int ext4_ext_grow_indepth(handle_t *handle, struct inode *inode, | |||
1177 | le32_to_cpu(EXT_FIRST_INDEX(neh)->ei_block), | 1177 | le32_to_cpu(EXT_FIRST_INDEX(neh)->ei_block), |
1178 | ext4_idx_pblock(EXT_FIRST_INDEX(neh))); | 1178 | ext4_idx_pblock(EXT_FIRST_INDEX(neh))); |
1179 | 1179 | ||
1180 | neh->eh_depth = cpu_to_le16(le16_to_cpu(neh->eh_depth) + 1); | 1180 | le16_add_cpu(&neh->eh_depth, 1); |
1181 | ext4_mark_inode_dirty(handle, inode); | 1181 | ext4_mark_inode_dirty(handle, inode); |
1182 | out: | 1182 | out: |
1183 | brelse(bh); | 1183 | brelse(bh); |
diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c index cee4bd066b7a..8076b96b5299 100644 --- a/fs/ext4/move_extent.c +++ b/fs/ext4/move_extent.c | |||
@@ -570,9 +570,8 @@ mext_calc_swap_extents(struct ext4_extent *tmp_dext, | |||
570 | diff = donor_off - le32_to_cpu(tmp_dext->ee_block); | 570 | diff = donor_off - le32_to_cpu(tmp_dext->ee_block); |
571 | 571 | ||
572 | ext4_ext_store_pblock(tmp_dext, ext4_ext_pblock(tmp_dext) + diff); | 572 | ext4_ext_store_pblock(tmp_dext, ext4_ext_pblock(tmp_dext) + diff); |
573 | tmp_dext->ee_block = | 573 | le32_add_cpu(&tmp_dext->ee_block, diff); |
574 | cpu_to_le32(le32_to_cpu(tmp_dext->ee_block) + diff); | 574 | le16_add_cpu(&tmp_dext->ee_len, -diff); |
575 | tmp_dext->ee_len = cpu_to_le16(le16_to_cpu(tmp_dext->ee_len) - diff); | ||
576 | 575 | ||
577 | if (max_count < ext4_ext_get_actual_len(tmp_dext)) | 576 | if (max_count < ext4_ext_get_actual_len(tmp_dext)) |
578 | tmp_dext->ee_len = cpu_to_le16(max_count); | 577 | tmp_dext->ee_len = cpu_to_le16(max_count); |
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index a53a23aef5e3..ae456321c5bf 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
@@ -431,7 +431,7 @@ static void __save_error_info(struct super_block *sb, const char *func, | |||
431 | */ | 431 | */ |
432 | if (!es->s_error_count) | 432 | if (!es->s_error_count) |
433 | mod_timer(&EXT4_SB(sb)->s_err_report, jiffies + 24*60*60*HZ); | 433 | mod_timer(&EXT4_SB(sb)->s_err_report, jiffies + 24*60*60*HZ); |
434 | es->s_error_count = cpu_to_le32(le32_to_cpu(es->s_error_count) + 1); | 434 | le32_add_cpu(&es->s_error_count, 1); |
435 | } | 435 | } |
436 | 436 | ||
437 | static void save_error_info(struct super_block *sb, const char *func, | 437 | static void save_error_info(struct super_block *sb, const char *func, |