summaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.31/234-union_mounts_no_debug.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.31/234-union_mounts_no_debug.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.31/234-union_mounts_no_debug.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.31/234-union_mounts_no_debug.patch b/target/linux/generic-2.6/patches-2.6.31/234-union_mounts_no_debug.patch
index 476d3700e..deabd4304 100644
--- a/target/linux/generic-2.6/patches-2.6.31/234-union_mounts_no_debug.patch
+++ b/target/linux/generic-2.6/patches-2.6.31/234-union_mounts_no_debug.patch
@@ -1,6 +1,6 @@
--- a/fs/union.c
+++ b/fs/union.c
-@@ -842,10 +842,8 @@
+@@ -842,10 +842,8 @@ static int union_copyup_dir_one(void *bu
/* Lookup this entry in the topmost directory */
dentry = lookup_one_len(name, topmost_dentry, namlen);
@@ -12,7 +12,7 @@
/*
* If the entry already exists, one of the following is true:
-@@ -857,7 +855,6 @@
+@@ -857,7 +855,6 @@ static int union_copyup_dir_one(void *bu
*/
if (dentry->d_inode || d_is_whiteout(dentry) ||
d_is_fallthru(dentry)) {
@@ -20,7 +20,7 @@
goto out_dput;
}
-@@ -867,7 +864,6 @@
+@@ -867,7 +864,6 @@ static int union_copyup_dir_one(void *bu
* used, so each file system must implement its own way of
* storing a fallthru entry.
*/