resync 2.6.31 patches
[openwrt/openwrt.git] / target / linux / generic-2.6 / patches-2.6.31 / 234-union_mounts_no_debug.patch
1 --- a/fs/union.c
2 +++ b/fs/union.c
3 @@ -842,10 +842,8 @@ static int union_copyup_dir_one(void *bu
4 /* Lookup this entry in the topmost directory */
5 dentry = lookup_one_len(name, topmost_dentry, namlen);
6
7 - if (IS_ERR(dentry)) {
8 - printk(KERN_INFO "error looking up %s\n", dentry->d_name.name);
9 + if (IS_ERR(dentry))
10 goto out;
11 - }
12
13 /*
14 * If the entry already exists, one of the following is true:
15 @@ -857,7 +855,6 @@ static int union_copyup_dir_one(void *bu
16 */
17 if (dentry->d_inode || d_is_whiteout(dentry) ||
18 d_is_fallthru(dentry)) {
19 - printk(KERN_INFO "skipping copy of %s\n", dentry->d_name.name);
20 goto out_dput;
21 }
22
23 @@ -867,7 +864,6 @@ static int union_copyup_dir_one(void *bu
24 * used, so each file system must implement its own way of
25 * storing a fallthru entry.
26 */
27 - printk(KERN_INFO "creating fallthru for %s\n", dentry->d_name.name);
28 err = topmost_dentry->d_inode->i_op->fallthru(topmost_dentry->d_inode,
29 dentry);
30 /* FIXME */