hc
2024-05-10 23fa18eaa71266feff7ba8d83022d9e1cc83c65a
kernel/fs/f2fs/file.c
....@@ -629,7 +629,7 @@
629629 fofs = f2fs_start_bidx_of_node(ofs_of_node(dn->node_page),
630630 dn->inode) + ofs;
631631 f2fs_update_read_extent_cache_range(dn, fofs, 0, len);
632
- f2fs_update_age_extent_cache_range(dn, fofs, nr_free);
632
+ f2fs_update_age_extent_cache_range(dn, fofs, len);
633633 dec_valid_block_count(sbi, dn->inode, nr_free);
634634 }
635635 dn->ofs_in_node = ofs;
....@@ -1453,6 +1453,7 @@
14531453 }
14541454
14551455 f2fs_update_read_extent_cache_range(dn, start, 0, index - start);
1456
+ f2fs_update_age_extent_cache_range(dn, start, index - start);
14561457
14571458 return ret;
14581459 }
....@@ -3039,15 +3040,16 @@
30393040 struct dquot *transfer_to[MAXQUOTAS] = {};
30403041 struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
30413042 struct super_block *sb = sbi->sb;
3042
- int err = 0;
3043
+ int err;
30433044
30443045 transfer_to[PRJQUOTA] = dqget(sb, make_kqid_projid(kprojid));
3045
- if (!IS_ERR(transfer_to[PRJQUOTA])) {
3046
- err = __dquot_transfer(inode, transfer_to);
3047
- if (err)
3048
- set_sbi_flag(sbi, SBI_QUOTA_NEED_REPAIR);
3049
- dqput(transfer_to[PRJQUOTA]);
3050
- }
3046
+ if (IS_ERR(transfer_to[PRJQUOTA]))
3047
+ return PTR_ERR(transfer_to[PRJQUOTA]);
3048
+
3049
+ err = __dquot_transfer(inode, transfer_to);
3050
+ if (err)
3051
+ set_sbi_flag(sbi, SBI_QUOTA_NEED_REPAIR);
3052
+ dqput(transfer_to[PRJQUOTA]);
30513053 return err;
30523054 }
30533055
....@@ -3381,7 +3383,7 @@
33813383 sizeof(block_count)))
33823384 return -EFAULT;
33833385
3384
- return f2fs_resize_fs(sbi, block_count);
3386
+ return f2fs_resize_fs(filp, block_count);
33853387 }
33863388
33873389 static int f2fs_ioc_enable_verity(struct file *filp, unsigned long arg)