1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00

resync 2.6.31 patches

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17991 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
kaloz
2009-10-08 09:13:14 +00:00
parent 3138a26410
commit 195e79a202
2 changed files with 11 additions and 11 deletions

View File

@@ -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.
*/