diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-08-21 14:21:08 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-08-27 00:27:56 +0200 |
commit | a2a75c21bdb1afc6786d01693c8a52f34197ea9b (patch) | |
tree | a20ada2bbaabe985c2a6c67590ca6e476a3f6c64 /target/linux/generic/pending-4.14/141-jffs2-add-RENAME_EXCHANGE-support.patch | |
parent | 8b0278a17eea57558ff38e825f37c538af3827e2 (diff) | |
download | upstream-a2a75c21bdb1afc6786d01693c8a52f34197ea9b.tar.gz upstream-a2a75c21bdb1afc6786d01693c8a52f34197ea9b.tar.bz2 upstream-a2a75c21bdb1afc6786d01693c8a52f34197ea9b.zip |
kernel: Update kernel 4.14 to version 4.14.195
Compile and runtime tested on lantiq/xrx200 and x86/64.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-4.14/141-jffs2-add-RENAME_EXCHANGE-support.patch')
-rw-r--r-- | target/linux/generic/pending-4.14/141-jffs2-add-RENAME_EXCHANGE-support.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/pending-4.14/141-jffs2-add-RENAME_EXCHANGE-support.patch b/target/linux/generic/pending-4.14/141-jffs2-add-RENAME_EXCHANGE-support.patch index 093a73ab66..4b30bc7cd0 100644 --- a/target/linux/generic/pending-4.14/141-jffs2-add-RENAME_EXCHANGE-support.patch +++ b/target/linux/generic/pending-4.14/141-jffs2-add-RENAME_EXCHANGE-support.patch @@ -6,7 +6,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/fs/jffs2/dir.c +++ b/fs/jffs2/dir.c -@@ -777,18 +777,31 @@ static int jffs2_rename (struct inode *o +@@ -781,18 +781,31 @@ static int jffs2_rename (struct inode *o int ret; struct jffs2_sb_info *c = JFFS2_SB_INFO(old_dir_i->i_sb); struct jffs2_inode_info *victim_f = NULL; @@ -40,7 +40,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> victim_f = JFFS2_INODE_INFO(d_inode(new_dentry)); if (d_is_dir(new_dentry)) { struct jffs2_full_dirent *fd; -@@ -823,7 +836,7 @@ static int jffs2_rename (struct inode *o +@@ -827,7 +840,7 @@ static int jffs2_rename (struct inode *o if (ret) return ret; @@ -49,7 +49,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> /* There was a victim. Kill it off nicely */ if (d_is_dir(new_dentry)) clear_nlink(d_inode(new_dentry)); -@@ -849,6 +862,12 @@ static int jffs2_rename (struct inode *o +@@ -853,6 +866,12 @@ static int jffs2_rename (struct inode *o if (flags & RENAME_WHITEOUT) /* Replace with whiteout */ ret = jffs2_whiteout(old_dir_i, old_dentry); @@ -62,7 +62,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> else /* Unlink the original */ ret = jffs2_do_unlink(c, JFFS2_INODE_INFO(old_dir_i), -@@ -880,7 +899,7 @@ static int jffs2_rename (struct inode *o +@@ -884,7 +903,7 @@ static int jffs2_rename (struct inode *o return ret; } |