diff --git a/[refs] b/[refs] index 5dddbe59d29a..6e3887995547 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ac35783f4a471d43c557db27928bc29f8a9c6d0 +refs/heads/master: 3be7d29fb9c02962b49be636b30ca9cadd0fda4b diff --git a/trunk/fs/dcache.c b/trunk/fs/dcache.c index 0c78f05819df..0778f49f993b 100644 --- a/trunk/fs/dcache.c +++ b/trunk/fs/dcache.c @@ -34,7 +34,6 @@ #include #include -/* #define DCACHE_DEBUG 1 */ int sysctl_vfs_cache_pressure = 100; EXPORT_SYMBOL_GPL(sysctl_vfs_cache_pressure); @@ -603,10 +602,6 @@ static int select_parent(struct dentry * parent) */ if (!list_empty(&dentry->d_subdirs)) { this_parent = dentry; -#ifdef DCACHE_DEBUG -printk(KERN_DEBUG "select_parent: descending to %s/%s, found=%d\n", -dentry->d_parent->d_name.name, dentry->d_name.name, found); -#endif goto repeat; } } @@ -616,10 +611,6 @@ dentry->d_parent->d_name.name, dentry->d_name.name, found); if (this_parent != parent) { next = this_parent->d_u.d_child.next; this_parent = this_parent->d_parent; -#ifdef DCACHE_DEBUG -printk(KERN_DEBUG "select_parent: ascending to %s/%s, found=%d\n", -this_parent->d_parent->d_name.name, this_parent->d_name.name, found); -#endif goto resume; } out: