diff --git a/PKGBUILD b/PKGBUILD index 2f4cef8..7af2833 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -833,7 +833,7 @@ case $_basever in #'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177' #'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911' #'766658d5ec9cf204635f735a8927854991d0133b2e34bdcd9ca36d7e34817e27' - '1aa0a172e1e27fb8171053f3047dcf4a61bd2eda5ea18f02b2bb391741a69887' + '7b487db1dda2e7b9fd2465118b4086cbe86efc695f70a4dce13c09fbe8e7f946' '1b656ad96004f27e9dc63d7f430b50d5c48510d6d4cd595a81c24b21adb70313' 'b0319a7dff9c48b2f3e3d3597ee154bf92223149a633a8b7ce4026252db86da6') ;; diff --git a/linux-tkg-patches/5.19/0012-misc-additions.patch b/linux-tkg-patches/5.19/0012-misc-additions.patch index 5a5ff5b..244caec 100644 --- a/linux-tkg-patches/5.19/0012-misc-additions.patch +++ b/linux-tkg-patches/5.19/0012-misc-additions.patch @@ -187,3 +187,52 @@ index 7de599eba7f0..62a5986d625a 100644 -- 2.25.1 + +diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c +index c549acb52ac4..a841abe6a071 100644 +--- a/fs/f2fs/namei.c ++++ b/fs/f2fs/namei.c +@@ -89,8 +89,6 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns, + if (test_opt(sbi, INLINE_XATTR)) + set_inode_flag(inode, FI_INLINE_XATTR); + +- if (test_opt(sbi, INLINE_DATA) && f2fs_may_inline_data(inode)) +- set_inode_flag(inode, FI_INLINE_DATA); + if (f2fs_may_inline_dentry(inode)) + set_inode_flag(inode, FI_INLINE_DENTRY); + +@@ -107,10 +105,6 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns, + + f2fs_init_extent_tree(inode, NULL); + +- stat_inc_inline_xattr(inode); +- stat_inc_inline_inode(inode); +- stat_inc_inline_dir(inode); +- + F2FS_I(inode)->i_flags = + f2fs_mask_flags(mode, F2FS_I(dir)->i_flags & F2FS_FL_INHERITED); + +@@ -127,6 +121,14 @@ static struct inode *f2fs_new_inode(struct user_namespace *mnt_userns, + set_compress_context(inode); + } + ++ /* Should enable inline_data after compression set */ ++ if (test_opt(sbi, INLINE_DATA) && f2fs_may_inline_data(inode)) ++ set_inode_flag(inode, FI_INLINE_DATA); ++ ++ stat_inc_inline_xattr(inode); ++ stat_inc_inline_inode(inode); ++ stat_inc_inline_dir(inode); ++ + f2fs_set_inode_flags(inode); + + trace_f2fs_new_inode(inode, 0); +@@ -325,6 +327,8 @@ static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode, + if (!is_extension_exist(name, ext[i], false)) + continue; + ++ /* Do not use inline_data with compression */ ++ clear_inode_flag(inode, FI_INLINE_DATA); + set_compress_context(inode); + return; + }