diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-01-26 17:15:04 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-01-26 17:26:25 +1100 |
| commit | 4b91772c4a74ac3bfd8d4366d25b7b58fd9fdd06 (patch) | |
| tree | 9124663d0b36ffa3430439ba3b48361ada1dd45a /include | |
| parent | 674d315d02d1a1920cc48caf1b51ec362a86f3d3 (diff) | |
| parent | 7f97784510006c41f045d97f1c48f7c639715873 (diff) | |
Merge commit 'proc/proc'
Conflicts:
security/selinux/hooks.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/magic.h | 1 | ||||
| -rw-r--r-- | include/linux/proc_fs.h | 10 | ||||
| -rw-r--r-- | include/net/net_namespace.h | 1 |
3 files changed, 7 insertions, 5 deletions
diff --git a/include/linux/magic.h b/include/linux/magic.h index 5b4e28bcb788..0cde7c7a27a7 100644 --- a/include/linux/magic.h +++ b/include/linux/magic.h @@ -33,6 +33,7 @@ #define NFS_SUPER_MAGIC 0x6969 #define OPENPROM_SUPER_MAGIC 0x9fa1 #define PROC_SUPER_MAGIC 0x9fa0 +#define PROC_NET_SUPER_MAGIC 0x706e6574 #define QNX4_SUPER_MAGIC 0x002f /* qnx4 fs detection */ #define REISERFS_SUPER_MAGIC 0x52654973 /* used by gcc */ diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h index b8bdb96eff78..4f13811bdcbd 100644 --- a/include/linux/proc_fs.h +++ b/include/linux/proc_fs.h @@ -101,6 +101,7 @@ extern spinlock_t proc_subdir_lock; extern void proc_root_init(void); +void proc_shrink_automounts(void); void proc_flush_task(struct task_struct *task); struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *); int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir); @@ -207,6 +208,10 @@ static inline void proc_flush_task(struct task_struct *task) { } +static inline void proc_shrink_automounts(void) +{ +} + static inline struct proc_dir_entry *create_proc_entry(const char *name, mode_t mode, struct proc_dir_entry *parent) { return NULL; } static inline struct proc_dir_entry *proc_create(const char *name, @@ -299,11 +304,6 @@ static inline struct proc_dir_entry *PDE(const struct inode *inode) return PROC_I(inode)->pde; } -static inline struct net *PDE_NET(struct proc_dir_entry *pde) -{ - return pde->parent->data; -} - struct proc_maps_private { struct pid *pid; struct task_struct *task; diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index 6fc13d905c5f..055a82cd5f8d 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h @@ -41,6 +41,7 @@ struct net { struct proc_dir_entry *proc_net; struct proc_dir_entry *proc_net_stat; + struct vfsmount *proc_mnt; #ifdef CONFIG_SYSCTL struct ctl_table_set sysctls; |