aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.0/110-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-04-19 11:38:46 +0000
committerJonas Gorski <jogo@openwrt.org>2015-04-19 11:38:46 +0000
commit025b5cf8bdea775b87a19b80c3a4c8e3b19beec9 (patch)
treea4ceeb440e0607a889a5403d4cff15b9664dbd56 /target/linux/generic/patches-4.0/110-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch
parent1da88fdb3e0344c56d40f7ad69ca153a289d9a27 (diff)
downloadmaster-187ad058-025b5cf8bdea775b87a19b80c3a4c8e3b19beec9.tar.gz
master-187ad058-025b5cf8bdea775b87a19b80c3a4c8e3b19beec9.tar.bz2
master-187ad058-025b5cf8bdea775b87a19b80c3a4c8e3b19beec9.zip
kernel: refresh generic patches
Refresh patches to remove the trailing whitespaces caused by an old diffutils version on osx. Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45506 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-4.0/110-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch')
-rw-r--r--target/linux/generic/patches-4.0/110-jffs2-use-.rename2-and-add-RENAME_WHITEOUT-support.patch2
1 files changed, 1 insertions, 1 deletions
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 4ffa3c26fe..9d32777fea 100644
--- 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 */