ar71xx/image: migrate tl-wr841nd-v1.5 to new build step using squashfs+jffs2 instead...

[oweals/openwrt.git] / target / linux / generic / patches-4.0 / 110-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch

diff --git a/target/linux/generic/patches-4.0/110-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch b/target/linux/generic/patches-4.0/110-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch
index 4ffa3c26fecbe6b6f0a9873138707f65758c1e0d..9d32777feaf42d45006c52b74370441877ec907f 100644 (file)
--- a/target/linux/generic/patches-4.0/110-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch
+++ b/target/linux/generic/patches-4.0/110-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch
@@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
         * 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
-       if (S_ISDIR(old_dentry->d_inode->i_mode) && !victim_f)
+       if (d_is_dir(old_dentry) && !victim_f)
                inc_nlink(new_dir_i);
  
 -      /* Unlink the original */