linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / linux / proc_fs.h

diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
index 0713dc5..d79a132 100644 (file)
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
@@ -4,7 +4,6 @@
 #include <linux/config.h>
 #include <linux/slab.h>
 #include <linux/fs.h>
-#include <linux/spinlock.h>
 #include <asm/atomic.h>
 
 /*
@@ -57,9 +56,9 @@ struct proc_dir_entry {
        uid_t uid;
        gid_t gid;
        int vx_flags;
-       loff_t size;
+       unsigned long size;
        struct inode_operations * proc_iops;
-       const struct file_operations * proc_fops;
+       struct file_operations * proc_fops;
        get_info_t *get_info;
        struct module *owner;
        struct proc_dir_entry *next, *parent, *subdir;
@@ -94,8 +93,6 @@ extern struct proc_dir_entry *proc_bus;
 extern struct proc_dir_entry *proc_root_driver;
 extern struct proc_dir_entry *proc_root_kcore;
 
-extern spinlock_t proc_subdir_lock;
-
 extern void proc_root_init(void);
 extern void proc_misc_init(void);
 
@@ -129,9 +126,9 @@ extern int proc_match(int, const char *,struct proc_dir_entry *);
 extern int proc_readdir(struct file *, void *, filldir_t);
 extern struct dentry *proc_lookup(struct inode *, struct dentry *, struct nameidata *);
 
-extern const struct file_operations proc_kcore_operations;
-extern const struct file_operations proc_kmsg_operations;
-extern const struct file_operations ppc_htab_operations;
+extern struct file_operations proc_kcore_operations;
+extern struct file_operations proc_kmsg_operations;
+extern struct file_operations ppc_htab_operations;
 
 /*
  * proc_tty.c
@@ -190,7 +187,7 @@ static inline struct proc_dir_entry *proc_net_create(const char *name,
 }
 
 static inline struct proc_dir_entry *proc_net_fops_create(const char *name,
-       mode_t mode, const struct file_operations *fops)
+       mode_t mode, struct file_operations *fops)
 {
        struct proc_dir_entry *res = create_proc_entry(name, mode, proc_net);
        if (res)