patch-2.2.18 linux/fs/proc/root.c

• Lines: 35
• Date: Tue Sep 26 21:48:57 2000
• Orig file: v2.2.17/fs/proc/root.c
• Orig date: Fri Apr 21 12:46:45 2000

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/fs/proc/root.c linux/fs/proc/root.c
@@ -29,7 +29,6 @@
 
 static int proc_root_readdir(struct file *, void *, filldir_t);
 static struct dentry *proc_root_lookup(struct inode *,struct dentry *);
-static int proc_unlink(struct inode *, struct dentry *);
 
 static unsigned char proc_alloc_map[PROC_NDYNAMIC / 8] = {0};
 
@@ -86,7 +85,7 @@
 	NULL,			/* create */
 	proc_lookup,		/* lookup */
 	NULL,			/* link	*/
-	proc_unlink,		/* unlink(struct inode *, struct dentry *) */
+	NULL, 			/* unlink(struct inode *, struct dentry *) */
 	NULL,			/* symlink	*/
 	NULL,			/* mkdir */
 	NULL,			/* rmdir */
@@ -988,17 +987,5 @@
 			break;
 		filp->f_pos++;
 	}
-	return 0;
-}
-
-static int proc_unlink(struct inode *dir, struct dentry *dentry)
-{
-	struct proc_dir_entry * dp = dir->u.generic_ip;
-
-printk("proc_file_unlink: deleting %s/%s\n", dp->name, dentry->d_name.name);
-
-	remove_proc_entry(dentry->d_name.name, dp);
-	dentry->d_inode->i_nlink = 0;
-	d_delete(dentry);
 	return 0;
 }