diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-08-20 10:43:09 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-08-20 13:03:23 +0200 |
| commit | 548182bc6d38a3817c8e9f5b11207043a31c59b9 (patch) | |
| tree | 47925b7011e6f85ccac7ce7eb6fae55423778248 /target/linux/generic/pending-3.18/111-jffs2-add-RENAME_EXCHANGE-support.patch | |
| parent | 1f7ce19df292dfe3c270091ac0f7edc5bb9a8324 (diff) | |
| download | mtk-20170518-548182bc6d38a3817c8e9f5b11207043a31c59b9.zip mtk-20170518-548182bc6d38a3817c8e9f5b11207043a31c59b9.tar.gz mtk-20170518-548182bc6d38a3817c8e9f5b11207043a31c59b9.tar.bz2 | |
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/111-jffs2-add-RENAME_EXCHANGE-support.patch')
| -rw-r--r-- | target/linux/generic/pending-3.18/111-jffs2-add-RENAME_EXCHANGE-support.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/pending-3.18/111-jffs2-add-RENAME_EXCHANGE-support.patch b/target/linux/generic/pending-3.18/111-jffs2-add-RENAME_EXCHANGE-support.patch index be87c35..e0ed331 100644 --- a/target/linux/generic/pending-3.18/111-jffs2-add-RENAME_EXCHANGE-support.patch +++ b/target/linux/generic/pending-3.18/111-jffs2-add-RENAME_EXCHANGE-support.patch @@ -7,7 +7,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/fs/jffs2/dir.c +++ b/fs/jffs2/dir.c -@@ -784,7 +784,7 @@ static int jffs2_rename (struct inode *o +@@ -780,7 +780,7 @@ static int jffs2_rename (struct inode *o uint8_t type; uint32_t now; @@ -16,7 +16,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> return -EINVAL; /* The VFS will check for us and prevent trying to rename a -@@ -792,7 +792,7 @@ static int jffs2_rename (struct inode *o +@@ -788,7 +788,7 @@ static int jffs2_rename (struct inode *o * the VFS can't check whether the victim is empty. The filesystem * needs to do that for itself. */ @@ -25,7 +25,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> victim_f = JFFS2_INODE_INFO(new_dentry->d_inode); if (S_ISDIR(new_dentry->d_inode->i_mode)) { struct jffs2_full_dirent *fd; -@@ -827,7 +827,7 @@ static int jffs2_rename (struct inode *o +@@ -823,7 +823,7 @@ static int jffs2_rename (struct inode *o if (ret) return ret; @@ -34,7 +34,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> /* There was a victim. Kill it off nicely */ if (S_ISDIR(new_dentry->d_inode->i_mode)) clear_nlink(new_dentry->d_inode); -@@ -853,6 +853,12 @@ static int jffs2_rename (struct inode *o +@@ -849,6 +849,12 @@ static int jffs2_rename (struct inode *o if (flags & RENAME_WHITEOUT) /* Replace with whiteout */ ret = jffs2_whiteout(old_dir_i, old_dentry); @@ -47,7 +47,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> else /* Unlink the original */ ret = jffs2_do_unlink(c, JFFS2_INODE_INFO(old_dir_i), -@@ -879,7 +885,7 @@ static int jffs2_rename (struct inode *o +@@ -875,7 +881,7 @@ static int jffs2_rename (struct inode *o return ret; } |