Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12

1 files changed, 17 insertions, 1 deletions

diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index cca93b6..737e156 100644
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -175,6 +175,22 @@ static const struct inode_operations proc_link_inode_operations = {
 };
 
 /*
+ * As some entries in /proc are volatile, we want to 
+ * get rid of unused dentries.  This could be made 
+ * smarter: we could keep a "volatile" flag in the 
+ * inode to indicate which ones to keep.
+ */
+static int proc_delete_dentry(const struct dentry * dentry)
+{
+	return 1;
+}
+
+static const struct dentry_operations proc_dentry_operations =
+{
+	.d_delete	= proc_delete_dentry,
+};
+
+/*
  * Don't create negative dentries here, return -ENOENT by hand
  * instead.
  */
@@ -193,7 +209,7 @@ struct dentry *proc_lookup_de(struct proc_dir_entry *de, struct inode *dir,
 			inode = proc_get_inode(dir->i_sb, de);
 			if (!inode)
 				return ERR_PTR(-ENOMEM);
-			d_set_d_op(dentry, &simple_dentry_operations);
+			d_set_d_op(dentry, &proc_dentry_operations);
 			d_add(dentry, inode);
 			return NULL;
 		}