Changeset 679 for GPL/trunk/include/linux/proc_fs.h

Timestamp:

Mar 18, 2021, 8:57:36 PM (4 years ago)

Author:

David Azarewicz

Message:

Merge changes from Paul's uniaud32next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• include/linux/proc_fs.h (modified) (5 diffs)

GPL/trunk/include/linux/proc_fs.h

@@ -8 +8 @@
  * The proc filesystem constants/structures
  */
+
+struct proc_ops {
+        int     (*proc_open)(struct inode *, struct file *);
+        ssize_t (*proc_read)(struct file *, char __user *, size_t, loff_t *);
+        ssize_t (*proc_write)(struct file *, const char __user *, size_t, loff_t *);
+        loff_t  (*proc_lseek)(struct file *, loff_t, int);
+        int     (*proc_release)(struct inode *, struct file *);
+        __poll_t (*proc_poll)(struct file *, struct poll_table_struct *);
+        long    (*proc_ioctl)(struct file *, unsigned int, unsigned long);
+#ifdef CONFIG_COMPAT
+        long    (*proc_compat_ioctl)(struct file *, unsigned int, unsigned long);
+#endif
+        int     (*proc_mmap)(struct file *, struct vm_area_struct *);
+        unsigned long (*proc_get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
+};
 
 /*
@@ -84 +99 @@
 
 #ifdef CONFIG_PROC_FS
-
 extern struct proc_dir_entry proc_root;
 extern struct proc_dir_entry *proc_root_fs;
@@ -208 +222 @@
 struct proc_dir_entry *proc_net_create(const char *name);
 void proc_net_remove(const char *name);
-
+static inline void proc_remove(struct proc_dir_entry *de) {}
 #else
 
@@ -233 +247 @@
 
 extern struct proc_dir_entry proc_root;
-
+static inline void proc_remove(struct proc_dir_entry *de) {}
+static inline void *PDE_DATA(const struct inode *inode) {return NULL;}
 #endif /* CONFIG_PROC_FS */
 
@@ -240 +255 @@
         return (struct proc_dir_entry *) inode->u.generic_ip;
 }
-
+static inline void *PDE_DATA(const struct inode *inode) {return NULL;}
+
+extern struct proc_dir_entry *proc_symlink(const char *,
+                struct proc_dir_entry *, const char *);
+extern struct proc_dir_entry *proc_mkdir(const char *, struct proc_dir_entry *);
 #endif /* _LINUX_PROC_FS_H */