[][Upgrade kernel version from 5.4.236 to 5.4.246]
[Description]
Fix fs/ubifs/dir.c confilct in 999-2380-fix-dirty-race-between-do_tmpfile.patch
Change kernel version and hash in 201-change_kernel_version_and_hash_due_to_upgrading_from_5.4.238_to_5.4.246.patch
Remove patch because kernel has merge patch in 202-fix-patch-conflict-due_to_upgrading_from_5.4.238_to_5.4.246.patch
[Release-log]
Change-Id: I4e419ac395ea2229d26b0c9f4b2a5145d96095b8
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/7648993
diff --git a/target/linux/mediatek/patches-5.4/999-2380-fix-dirty-race-between-do_tmpfile.patch b/target/linux/mediatek/patches-5.4/999-2380-fix-dirty-race-between-do_tmpfile.patch
index 63943f8..cece259 100644
--- a/target/linux/mediatek/patches-5.4/999-2380-fix-dirty-race-between-do_tmpfile.patch
+++ b/target/linux/mediatek/patches-5.4/999-2380-fix-dirty-race-between-do_tmpfile.patch
@@ -45,7 +45,7 @@
static int do_tmpfile(struct inode *dir, struct dentry *dentry,
umode_t mode, struct inode **whiteout)
{
-@@ -364,7 +390,7 @@ static int do_tmpfile(struct inode *dir, struct dentry *dentry,
+@@ -364,7 +390,7 @@ static int do_tmpfile(struct inode *dir,
struct ubifs_budget_req req = { .new_ino = 1, .new_dent = 1,
.dirtied_ino = 1};
struct ubifs_budget_req ino_req = { .dirtied_ino = 1 };
@@ -54,7 +54,7 @@
int err, instantiated = 0;
struct fscrypt_name nm;
-@@ -426,18 +452,18 @@ static int do_tmpfile(struct inode *dir, struct dentry *dentry,
+@@ -426,11 +452,11 @@ static int do_tmpfile(struct inode *dir,
instantiated = 1;
mutex_unlock(&ui->ui_mutex);
@@ -67,7 +67,8 @@
+ unlock_2_inodes(dir, inode);
ubifs_release_budget(c, &req);
-
+ fscrypt_free_filename(&nm);
+@@ -438,7 +464,7 @@ static int do_tmpfile(struct inode *dir,
return 0;
out_cancel:
@@ -76,7 +77,7 @@
out_inode:
make_bad_inode(inode);
if (!instantiated)
-@@ -672,32 +698,6 @@ static int ubifs_dir_release(struct inode *dir, struct file *file)
+@@ -673,32 +699,6 @@ static int ubifs_dir_release(struct inod
return 0;
}