LTS Refresh: Merge upto 70785c900b497f6e7c52eb1a2cd2fd3bc17da8f1 (buildnumber: 17162.127.0) from main-R101-cos-5.15 to release-R101-cos-5.15.
BUG=b/270200915
TEST=presubmit
RELEASE_NOTE=LTS Refresh from main-R101-cos-5.15 to release-R101-cos-5.15
Change-Id: Ib2b7c67fea2e7e79b494f30677df69a109b69e5c
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
index 405c680..589ed99 100644
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
@@ -1445,8 +1445,6 @@
* active. */
ext4_r_blocks_count_set(es, ext4_r_blocks_count(es) +
reserved_blocks);
- ext4_superblock_csum_set(sb);
- unlock_buffer(sbi->s_sbh);
/* Update the free space counts */
percpu_counter_add(&sbi->s_freeclusters_counter,
@@ -1474,6 +1472,8 @@
ext4_calculate_overhead(sb);
es->s_overhead_clusters = cpu_to_le32(sbi->s_overhead);
+ ext4_superblock_csum_set(sb);
+ unlock_buffer(sbi->s_sbh);
if (test_opt(sb, DEBUG))
printk(KERN_DEBUG "EXT4-fs: added group %u:"
"%llu blocks(%llu free %llu reserved)\n", flex_gd->count,
