aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-3.18/110-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-08-20 10:43:09 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-08-20 13:03:23 +0200
commit548182bc6d38a3817c8e9f5b11207043a31c59b9 (patch)
tree47925b7011e6f85ccac7ce7eb6fae55423778248 /target/linux/generic/pending-3.18/110-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch
parent1f7ce19df292dfe3c270091ac0f7edc5bb9a8324 (diff)
downloadupstream-548182bc6d38a3817c8e9f5b11207043a31c59b9.tar.gz
upstream-548182bc6d38a3817c8e9f5b11207043a31c59b9.tar.bz2
upstream-548182bc6d38a3817c8e9f5b11207043a31c59b9.zip
kernel: bump 3.18 to 3.18.119
Refreshed all patches. Compile-tested on: adm5120, adm8668, au1000, mcs814x, ppc40x, ppc44x, xburst Runtime-tested on: none Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-3.18/110-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch')
-rw-r--r--target/linux/generic/pending-3.18/110-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/pending-3.18/110-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch b/target/linux/generic/pending-3.18/110-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch
index f671db6e94..6bbeb93cfa 100644
--- a/target/linux/generic/pending-3.18/110-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch
+++ b/target/linux/generic/pending-3.18/110-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch
@@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
.get_acl = jffs2_get_acl,
.set_acl = jffs2_set_acl,
.setattr = jffs2_setattr,
-@@ -756,8 +756,27 @@ static int jffs2_mknod (struct inode *di
+@@ -752,8 +752,27 @@ static int jffs2_mknod (struct inode *di
return ret;
}
@@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
{
int ret;
struct jffs2_sb_info *c = JFFS2_SB_INFO(old_dir_i->i_sb);
-@@ -765,6 +784,9 @@ static int jffs2_rename (struct inode *o
+@@ -761,6 +780,9 @@ static int jffs2_rename (struct inode *o
uint8_t type;
uint32_t now;
@@ -66,7 +66,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/* The VFS will check for us and prevent trying to rename a
* file over a directory and vice versa, but if it's a directory,
* the VFS can't check whether the victim is empty. The filesystem
-@@ -828,9 +850,14 @@ static int jffs2_rename (struct inode *o
+@@ -824,9 +846,14 @@ static int jffs2_rename (struct inode *o
if (S_ISDIR(old_dentry->d_inode->i_mode) && !victim_f)
inc_nlink(new_dir_i);