Merge branches 'release' and 'stats' into release

[sfrench/cifs-2.6.git] / fs / proc / generic.c

diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index 8d49838e5554bd96e5b9106aafd6f03383cba890..6a2fe5187b6265db0c896aa9e68ec6fb7507a3a4 100644 (file)
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -374,16 +374,9 @@ static int proc_delete_dentry(struct dentry * dentry)
        return 1;
 }
 
-static int proc_revalidate_dentry(struct dentry *dentry, struct nameidata *nd)
-{
-       d_drop(dentry);
-       return 0;
-}
-
 static struct dentry_operations proc_dentry_operations =
 {
        .d_delete       = proc_delete_dentry,
-       .d_revalidate   = proc_revalidate_dentry,
 };
 
 /*