patch-2.1.29 linux/include/linux/proc_fs.h

• Lines: 67
• Date: Fri Mar 7 12:51:45 1997
• Orig file: v2.1.28/linux/include/linux/proc_fs.h
• Orig date: Tue Mar 4 10:25:26 1997

diff -u --recursive --new-file v2.1.28/linux/include/linux/proc_fs.h linux/include/linux/proc_fs.h
@@ -224,7 +224,7 @@
 	struct proc_dir_entry *next, *parent, *subdir;
 	void *data;
 	int (*read_proc)(char *page, char **start, off_t off,
-			 int count, void *data);
+			 int count, int *eof, void *data);
 	int (*write_proc)(struct file *file, const char *buffer,
 			  unsigned long count, void *data);
 };
@@ -233,8 +233,8 @@
 				off_t offset, int length, int inout);
 
 extern struct proc_dir_entry proc_root;
-extern struct proc_dir_entry proc_net;
-extern struct proc_dir_entry proc_scsi;
+extern struct proc_dir_entry *proc_net;
+extern struct proc_dir_entry *proc_scsi;
 extern struct proc_dir_entry proc_sys;
 extern struct proc_dir_entry proc_openprom;
 extern struct proc_dir_entry proc_pid;
@@ -248,18 +248,16 @@
 extern void proc_net_init(void);
 
 extern int proc_register(struct proc_dir_entry *, struct proc_dir_entry *);
-extern int proc_register_dynamic(struct proc_dir_entry *, 
-				 struct proc_dir_entry *);
 extern int proc_unregister(struct proc_dir_entry *, int);
 
 static inline int proc_net_register(struct proc_dir_entry * x)
 {
-	return proc_register(&proc_net, x);
+	return proc_register(proc_net, x);
 }
 
 static inline int proc_net_unregister(int x)
 {
-	return proc_unregister(&proc_net, x);
+	return proc_unregister(proc_net, x);
 }
 
 static inline int proc_scsi_register(struct proc_dir_entry *driver, 
@@ -267,7 +265,7 @@
 {
     x->ops = &proc_scsi_inode_operations;
     if(x->low_ino < PROC_SCSI_FILE){
-	return(proc_register(&proc_scsi, x));
+	return(proc_register(proc_scsi, x));
     }else{
 	return(proc_register(driver, x));
     }
@@ -278,7 +276,7 @@
     extern void scsi_init_free(char *ptr, unsigned int size);
 
     if(x <= PROC_SCSI_FILE)
-	return(proc_unregister(&proc_scsi, x));
+	return(proc_unregister(proc_scsi, x));
     else {
 	struct proc_dir_entry **p = &driver->subdir, *dp;
 	int ret;
@@ -355,6 +353,7 @@
  */
 struct proc_dir_entry *create_proc_entry(const char *name, mode_t mode,
 					 struct proc_dir_entry *parent);
+void remove_proc_entry(const char *name, struct proc_dir_entry *parent);
 
 /*
  * proc_tty.c