kernel: bump kernel 4.4 to 4.4.135 for 17.01

[openwrt/staging/chunkeey.git] / target / linux / generic / patches-4.4 / 111-jffs2-add-RENAME_EXCHANGE-support.patch

diff --git a/target/linux/generic/patches-4.4/111-jffs2-add-RENAME_EXCHANGE-support.patch b/target/linux/generic/patches-4.4/111-jffs2-add-RENAME_EXCHANGE-support.patch
index 37eb073df968eb1c1de620ecab828edb7c16c555..ac231272e22592ebad7b13e50a423844c83f07e9 100644 (file)
--- a/target/linux/generic/patches-4.4/111-jffs2-add-RENAME_EXCHANGE-support.patch
+++ b/target/linux/generic/patches-4.4/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
-@@ -779,18 +779,31 @@ static int jffs2_rename (struct inode *o
+@@ -775,18 +775,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;
@@ -41,7 +41,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;
-@@ -825,7 +838,7 @@ static int jffs2_rename (struct inode *o
+@@ -821,7 +834,7 @@ static int jffs2_rename (struct inode *o
        if (ret)
                return ret;
  
@@ -50,7 +50,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));
-@@ -845,12 +858,18 @@ static int jffs2_rename (struct inode *o
+@@ -841,12 +854,18 @@ static int jffs2_rename (struct inode *o
  
        /* If it was a directory we moved, and there was no victim,
           increase i_nlink on its new parent */
@@ -70,7 +70,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        else
                /* Unlink the original */
                ret = jffs2_do_unlink(c, JFFS2_INODE_INFO(old_dir_i),
-@@ -882,7 +901,7 @@ static int jffs2_rename (struct inode *o
+@@ -878,7 +897,7 @@ static int jffs2_rename (struct inode *o
                return ret;
        }