kernel: bump 3.18 to 3.18.119

[openwrt/openwrt.git] / target / linux / generic / pending-3.18 / 111-jffs2-add-RENAME_EXCHANGE-support.patch

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 be87c3507e9161d2244625b26a1cd9948477421f..e0ed3312a2fecbc1aa42ced938d69edb7e1443d5 100644 (file)
--- 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;
        }