[PATCH] (2/2) inode trimming

	procfs switched to alloc_inode/destroy_inode.

diff --git a/drivers/net/wan/comx.c b/drivers/net/wan/comx.c
index 2d673bfda099b3d74cd09fb5f3fd06174644ae04..96d6f326ceb5b79dd9a260ec1dd83f85c26b0781 100644 (file)
--- a/drivers/net/wan/comx.c
+++ b/drivers/net/wan/comx.c
@@ -876,7 +876,7 @@ cleanup_dev:
 
 static int comx_rmdir(struct inode *dir, struct dentry *dentry)
 {
-       struct proc_dir_entry *entry = dentry->d_inode->u.generic_ip;
+       struct proc_dir_entry *entry = PDE(dentry->d_inode);
        struct net_device *dev = entry->data;
        struct comx_channel *ch = dev->priv;
        int ret;
@@ -928,7 +928,7 @@ static struct dentry *comx_lookup(struct inode *dir, struct dentry *dentry)
        struct proc_dir_entry *de;
        struct inode *inode = NULL;
 
-       if ((de = (struct proc_dir_entry *) dir->u.generic_ip) != NULL) {
+       if ((de = PDE(dir)) != NULL) {
                for (de = de->subdir ; de ; de = de->next) {
                        if ((de && de->low_ino) && 
                            (de->namelen == dentry->d_name.len) &&

diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 96448599116c33f881c7d6d120427d550e1bc7e1..72f4225836d160540bfd00ff52b00440a30ef896 100644 (file)
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -2280,7 +2280,7 @@ static ssize_t proc_write( struct file *file,
 
 static int proc_status_open( struct inode *inode, struct file *file ) {
        struct proc_data *data;
-       struct proc_dir_entry *dp = inode->u.generic_ip;
+       struct proc_dir_entry *dp = PDE(inode);
        struct net_device *dev = dp->data;
        struct airo_info *apriv = (struct airo_info *)dev->priv;
        CapabilityRid cap_rid;
@@ -2289,8 +2289,6 @@ static int proc_status_open( struct inode *inode, struct file *file ) {
 
        MOD_INC_USE_COUNT;
 
-       dp = inode->u.generic_ip;
-
        if ((file->private_data = kmalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
                return -ENOMEM;
        memset(file->private_data, 0, sizeof(struct proc_data));
@@ -2364,7 +2362,7 @@ static int proc_stats_rid_open( struct inode *inode,
                                struct file *file,
                                u16 rid ) {
        struct proc_data *data;
-       struct proc_dir_entry *dp = inode->u.generic_ip;
+       struct proc_dir_entry *dp = PDE(inode);
        struct net_device *dev = dp->data;
        struct airo_info *apriv = (struct airo_info *)dev->priv;
        StatsRid stats;
@@ -2372,9 +2370,6 @@ static int proc_stats_rid_open( struct inode *inode,
        int *vals = stats.vals;
        MOD_INC_USE_COUNT;
 
-
-       dp = inode->u.generic_ip;
-
        if ((file->private_data = kmalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
                return -ENOMEM;
        memset(file->private_data, 0, sizeof(struct proc_data));
@@ -2433,7 +2428,7 @@ static void checkThrottle(ConfigRid *config) {
 
 static void proc_config_on_close( struct inode *inode, struct file *file ) {
        struct proc_data *data = file->private_data;
-       struct proc_dir_entry *dp = inode->u.generic_ip;
+       struct proc_dir_entry *dp = PDE(inode);
        struct net_device *dev = dp->data;
        struct airo_info *ai = (struct airo_info*)dev->priv;
        ConfigRid config;
@@ -2442,7 +2437,6 @@ static void proc_config_on_close( struct inode *inode, struct file *file ) {
        int need_reset = 0;
 
        if ( !data->writelen ) return;
-       dp = (struct proc_dir_entry *) inode->u.generic_ip;
 
        disable_MAC(ai);
        readConfigRid(ai, &config);
@@ -2629,7 +2623,7 @@ static void proc_config_on_close( struct inode *inode, struct file *file ) {
 
 static int proc_config_open( struct inode *inode, struct file *file ) {
        struct proc_data *data;
-       struct proc_dir_entry *dp = inode->u.generic_ip;
+       struct proc_dir_entry *dp = PDE(inode);
        struct net_device *dev = dp->data;
        struct airo_info *ai = (struct airo_info*)dev->priv;
        ConfigRid config;
@@ -2637,8 +2631,6 @@ static int proc_config_open( struct inode *inode, struct file *file ) {
 
        MOD_INC_USE_COUNT;
 
-       dp = (struct proc_dir_entry *) inode->u.generic_ip;
-
        if ((file->private_data = kmalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
                return -ENOMEM;
        memset(file->private_data, 0, sizeof(struct proc_data));
@@ -2723,7 +2715,7 @@ static int proc_config_open( struct inode *inode, struct file *file ) {
 
 static void proc_SSID_on_close( struct inode *inode, struct file *file ) {
        struct proc_data *data = (struct proc_data *)file->private_data;
-       struct proc_dir_entry *dp = inode->u.generic_ip;
+       struct proc_dir_entry *dp = PDE(inode);
        struct net_device *dev = dp->data;
        struct airo_info *ai = (struct airo_info*)dev->priv;
        SsidRid SSID_rid;
@@ -2759,7 +2751,7 @@ inline static u8 hexVal(char c) {
 
 static void proc_APList_on_close( struct inode *inode, struct file *file ) {
        struct proc_data *data = (struct proc_data *)file->private_data;
-       struct proc_dir_entry *dp = inode->u.generic_ip;
+       struct proc_dir_entry *dp = PDE(inode);
        struct net_device *dev = dp->data;
        struct airo_info *ai = (struct airo_info*)dev->priv;
        APListRid APList_rid;
@@ -2852,7 +2844,7 @@ static int set_wep_key(struct airo_info *ai, u16 index,
 
 static void proc_wepkey_on_close( struct inode *inode, struct file *file ) {
        struct proc_data *data;
-       struct proc_dir_entry *dp = inode->u.generic_ip;
+       struct proc_dir_entry *dp = PDE(inode);
        struct net_device *dev = dp->data;
        struct airo_info *ai = (struct airo_info*)dev->priv;
        int i;
@@ -2862,7 +2854,6 @@ static void proc_wepkey_on_close( struct inode *inode, struct file *file ) {
 
        memset(key, 0, sizeof(key));
 
-       dp = (struct proc_dir_entry *) inode->u.generic_ip;
        data = (struct proc_data *)file->private_data;
        if ( !data->writelen ) return;
 
@@ -2894,7 +2885,7 @@ static void proc_wepkey_on_close( struct inode *inode, struct file *file ) {
 
 static int proc_wepkey_open( struct inode *inode, struct file *file ) {
        struct proc_data *data;
-       struct proc_dir_entry *dp = inode->u.generic_ip;
+       struct proc_dir_entry *dp = PDE(inode);
        struct net_device *dev = dp->data;
        struct airo_info *ai = (struct airo_info*)dev->priv;
        char *ptr;
@@ -2905,8 +2896,6 @@ static int proc_wepkey_open( struct inode *inode, struct file *file ) {
 
        MOD_INC_USE_COUNT;
 
-       dp = (struct proc_dir_entry *) inode->u.generic_ip;
-
        if ((file->private_data = kmalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
                return -ENOMEM;
        memset(file->private_data, 0, sizeof(struct proc_data));
@@ -2948,7 +2937,7 @@ static int proc_wepkey_open( struct inode *inode, struct file *file ) {
 
 static int proc_SSID_open( struct inode *inode, struct file *file ) {
        struct proc_data *data;
-       struct proc_dir_entry *dp = inode->u.generic_ip;
+       struct proc_dir_entry *dp = PDE(inode);
        struct net_device *dev = dp->data;
        struct airo_info *ai = (struct airo_info*)dev->priv;
        int i;
@@ -2957,8 +2946,6 @@ static int proc_SSID_open( struct inode *inode, struct file *file ) {
 
        MOD_INC_USE_COUNT;
 
-       dp = (struct proc_dir_entry *) inode->u.generic_ip;
-
        if ((file->private_data = kmalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
                return -ENOMEM;
        memset(file->private_data, 0, sizeof(struct proc_data));
@@ -2996,7 +2983,7 @@ static int proc_SSID_open( struct inode *inode, struct file *file ) {
 
 static int proc_APList_open( struct inode *inode, struct file *file ) {
        struct proc_data *data;
-       struct proc_dir_entry *dp = inode->u.generic_ip;
+       struct proc_dir_entry *dp = PDE(inode);
        struct net_device *dev = dp->data;
        struct airo_info *ai = (struct airo_info*)dev->priv;
        int i;
@@ -3005,8 +2992,6 @@ static int proc_APList_open( struct inode *inode, struct file *file ) {
 
        MOD_INC_USE_COUNT;
 
-       dp = (struct proc_dir_entry *) inode->u.generic_ip;
-
        if ((file->private_data = kmalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
                return -ENOMEM;
        memset(file->private_data, 0, sizeof(struct proc_data));
@@ -3048,7 +3033,7 @@ static int proc_APList_open( struct inode *inode, struct file *file ) {
 
 static int proc_BSSList_open( struct inode *inode, struct file *file ) {
        struct proc_data *data;
-       struct proc_dir_entry *dp = inode->u.generic_ip;
+       struct proc_dir_entry *dp = PDE(inode);
        struct net_device *dev = dp->data;
        struct airo_info *ai = (struct airo_info*)dev->priv;
        char *ptr;
@@ -3059,8 +3044,6 @@ static int proc_BSSList_open( struct inode *inode, struct file *file ) {
 
        MOD_INC_USE_COUNT;
 
-       dp = (struct proc_dir_entry *) inode->u.generic_ip;
-
        if ((file->private_data = kmalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
                return -ENOMEM;
        memset(file->private_data, 0, sizeof(struct proc_data));

diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
index 81ad8145422d4dffff2dac2bb124011567cc85a0..8ac8673c803d3055fb4bcf78c2fa4e1b8877b092 100644 (file)
--- a/drivers/pci/proc.c
+++ b/drivers/pci/proc.c
@@ -45,7 +45,7 @@ static ssize_t
 proc_bus_pci_read(struct file *file, char *buf, size_t nbytes, loff_t *ppos)
 {
        const struct inode *ino = file->f_dentry->d_inode;
-       const struct proc_dir_entry *dp = ino->u.generic_ip;
+       const struct proc_dir_entry *dp = PDE(ino);
        struct pci_dev *dev = dp->data;
        unsigned int pos = *ppos;
        unsigned int cnt, size;
@@ -127,7 +127,7 @@ static ssize_t
 proc_bus_pci_write(struct file *file, const char *buf, size_t nbytes, loff_t *ppos)
 {
        const struct inode *ino = file->f_dentry->d_inode;
-       const struct proc_dir_entry *dp = ino->u.generic_ip;
+       const struct proc_dir_entry *dp = PDE(ino);
        struct pci_dev *dev = dp->data;
        int pos = *ppos;
        int cnt;
@@ -199,7 +199,7 @@ struct pci_filp_private {
 
 static int proc_bus_pci_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
 {
-       const struct proc_dir_entry *dp = inode->u.generic_ip;
+       const struct proc_dir_entry *dp = PDE(inode);
        struct pci_dev *dev = dp->data;
 #ifdef HAVE_PCI_MMAP
        struct pci_filp_private *fpriv = file->private_data;
@@ -241,7 +241,7 @@ static int proc_bus_pci_ioctl(struct inode *inode, struct file *file, unsigned i
 static int proc_bus_pci_mmap(struct file *file, struct vm_area_struct *vma)
 {
        struct inode *inode = file->f_dentry->d_inode;
-       const struct proc_dir_entry *dp = inode->u.generic_ip;
+       const struct proc_dir_entry *dp = PDE(inode);
        struct pci_dev *dev = dp->data;
        struct pci_filp_private *fpriv = file->private_data;
        int ret;

diff --git a/drivers/pnp/isapnp_proc.c b/drivers/pnp/isapnp_proc.c
index 08085e106b1389a903fe52b95881933d1c458b65..11e1b2c4b4a14f0e9305ffd3807f44bd8ab23516 100644 (file)
--- a/drivers/pnp/isapnp_proc.c
+++ b/drivers/pnp/isapnp_proc.c
@@ -234,7 +234,7 @@ static loff_t isapnp_proc_bus_lseek(struct file *file, loff_t off, int whence)
 static ssize_t isapnp_proc_bus_read(struct file *file, char *buf, size_t nbytes, loff_t *ppos)
 {
        struct inode *ino = file->f_dentry->d_inode;
-       struct proc_dir_entry *dp = ino->u.generic_ip;
+       struct proc_dir_entry *dp = PDE(ino);
        struct pci_dev *dev = dp->data;
        int pos = *ppos;
        int cnt, size = 256;

diff --git a/drivers/usb/ov511.c b/drivers/usb/ov511.c
index c84a6691aec80dcbfd691412d98d5bd7c94967a0..dc6b2b28242155773c56855c9d309ec6a06915b9 100644 (file)
--- a/drivers/usb/ov511.c
+++ b/drivers/usb/ov511.c
@@ -5618,7 +5618,7 @@ ov511_control_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
        void *arg = (void *) ularg;
        int rc;
 
-       pde = (struct proc_dir_entry *) inode->u.generic_ip;
+       pde = PDE(inode);
        if (!pde)
                return -ENOENT;
 

diff --git a/drivers/usb/uhci-debug.h b/drivers/usb/uhci-debug.h
index 5ff42d2393d694e602aac106962426b9fd1840ca..ed8b768a0064d95f27fb9a76332e40c8250e57b7 100644 (file)
--- a/drivers/usb/uhci-debug.h
+++ b/drivers/usb/uhci-debug.h
@@ -476,7 +476,7 @@ struct uhci_proc {
 
 static int uhci_proc_open(struct inode *inode, struct file *file)
 {
-       const struct proc_dir_entry *dp = inode->u.generic_ip;
+       const struct proc_dir_entry *dp = PDE(inode);
        struct uhci *uhci = dp->data;
        struct uhci_proc *up;
        unsigned long flags;

diff --git a/drivers/zorro/proc.c b/drivers/zorro/proc.c
index 28b7c4272dd8419405e5805cbf12327262cdf263..c5cc2534c4f14716868780352303613e6a377452 100644 (file)
--- a/drivers/zorro/proc.c
+++ b/drivers/zorro/proc.c
@@ -45,7 +45,7 @@ static ssize_t
 proc_bus_zorro_read(struct file *file, char *buf, size_t nbytes, loff_t *ppos)
 {
        struct inode *ino = file->f_dentry->d_inode;
-       struct proc_dir_entry *dp = ino->u.generic_ip;
+       struct proc_dir_entry *dp = PDE(ino);
        struct zorro_dev *dev = dp->data;
        struct ConfigDev cd;
        int pos = *ppos;

diff --git a/fs/proc/base.c b/fs/proc/base.c
index ed0da13a0e91e525ad37c6eab5f8ebbef900c2d6..e472c395cccd7e9e9c0c0d69c47d7b6464eef25d 100644 (file)
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -37,6 +37,11 @@
 
 #define fake_ino(pid,ino) (((pid)<<16)|(ino))
 
+static inline struct task_struct *proc_task(struct inode *inode)
+{
+       return PROC_I(inode)->task;
+}
+
 ssize_t proc_pid_read_maps(struct task_struct*,struct file*,char*,size_t,loff_t*);
 int proc_pid_stat(struct task_struct*,char*);
 int proc_pid_status(struct task_struct*,char*);
@@ -45,9 +50,10 @@ int proc_pid_cpu(struct task_struct*,char*);
 
 static int proc_fd_link(struct inode *inode, struct dentry **dentry, struct vfsmount **mnt)
 {
-       if (inode->u.proc_i.file) {
-               *mnt = mntget(inode->u.proc_i.file->f_vfsmnt);
-               *dentry = dget(inode->u.proc_i.file->f_dentry);
+       struct file *file = PROC_I(inode)->file;
+       if (file) {
+               *mnt = mntget(file->f_vfsmnt);
+               *dentry = dget(file->f_dentry);
                return 0;
        }
        return -ENOENT;
@@ -58,7 +64,7 @@ static int proc_exe_link(struct inode *inode, struct dentry **dentry, struct vfs
        struct mm_struct * mm;
        struct vm_area_struct * vma;
        int result = -ENOENT;
-       struct task_struct *task = inode->u.proc_i.task;
+       struct task_struct *task = proc_task(inode);
 
        task_lock(task);
        mm = task->mm;
@@ -89,11 +95,11 @@ static int proc_cwd_link(struct inode *inode, struct dentry **dentry, struct vfs
 {
        struct fs_struct *fs;
        int result = -ENOENT;
-       task_lock(inode->u.proc_i.task);
-       fs = inode->u.proc_i.task->fs;
+       task_lock(proc_task(inode));
+       fs = proc_task(inode)->fs;
        if(fs)
                atomic_inc(&fs->count);
-       task_unlock(inode->u.proc_i.task);
+       task_unlock(proc_task(inode));
        if (fs) {
                read_lock(&fs->lock);
                *mnt = mntget(fs->pwdmnt);
@@ -109,11 +115,11 @@ static int proc_root_link(struct inode *inode, struct dentry **dentry, struct vf
 {
        struct fs_struct *fs;
        int result = -ENOENT;
-       task_lock(inode->u.proc_i.task);
-       fs = inode->u.proc_i.task->fs;
+       task_lock(proc_task(inode));
+       fs = proc_task(inode)->fs;
        if(fs)
                atomic_inc(&fs->count);
-       task_unlock(inode->u.proc_i.task);
+       task_unlock(proc_task(inode));
        if (fs) {
                read_lock(&fs->lock);
                *mnt = mntget(fs->rootmnt);
@@ -238,7 +244,7 @@ static ssize_t pid_maps_read(struct file * file, char * buf,
                              size_t count, loff_t *ppos)
 {
        struct inode * inode = file->f_dentry->d_inode;
-       struct task_struct *task = inode->u.proc_i.task;
+       struct task_struct *task = proc_task(inode);
        ssize_t res;
 
        res = proc_pid_read_maps(task, file, buf, count, ppos);
@@ -252,7 +258,7 @@ static struct file_operations proc_maps_operations = {
 extern struct seq_operations mounts_op;
 static int mounts_open(struct inode *inode, struct file *file)
 {
-       struct task_struct *task = inode->u.proc_i.task;
+       struct task_struct *task = proc_task(inode);
        int ret = seq_open(file, &mounts_op);
 
        if (!ret) {
@@ -298,14 +304,14 @@ static ssize_t proc_info_read(struct file * file, char * buf,
        unsigned long page;
        ssize_t length;
        ssize_t end;
-       struct task_struct *task = inode->u.proc_i.task;
+       struct task_struct *task = proc_task(inode);
 
        if (count > PROC_BLOCK_SIZE)
                count = PROC_BLOCK_SIZE;
        if (!(page = __get_free_page(GFP_KERNEL)))
                return -ENOMEM;
 
-       length = inode->u.proc_i.op.proc_read(task, (char*)page);
+       length = PROC_I(inode)->op.proc_read(task, (char*)page);
 
        if (length < 0) {
                free_page(page);
@@ -342,7 +348,7 @@ static int mem_open(struct inode* inode, struct file* file)
 static ssize_t mem_read(struct file * file, char * buf,
                        size_t count, loff_t *ppos)
 {
-       struct task_struct *task = file->f_dentry->d_inode->u.proc_i.task;
+       struct task_struct *task = proc_task(file->f_dentry->d_inode);
        char *page;
        unsigned long src = *ppos;
        int copied = 0;
@@ -404,7 +410,7 @@ static ssize_t mem_write(struct file * file, const char * buf,
 {
        int copied = 0;
        char *page;
-       struct task_struct *task = file->f_dentry->d_inode->u.proc_i.task;
+       struct task_struct *task = proc_task(file->f_dentry->d_inode);
        unsigned long dst = *ppos;
 
        if (!MAY_PTRACE(task))
@@ -463,7 +469,7 @@ static int proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
        if (error)
                goto out;
 
-       error = inode->u.proc_i.op.proc_get_link(inode, &nd->dentry, &nd->mnt);
+       error = PROC_I(inode)->op.proc_get_link(inode, &nd->dentry, &nd->mnt);
        nd->last_type = LAST_BIND;
 out:
        return error;
@@ -503,7 +509,7 @@ static int proc_pid_readlink(struct dentry * dentry, char * buffer, int buflen)
        if (error)
                goto out;
 
-       error = inode->u.proc_i.op.proc_get_link(inode, &de, &mnt);
+       error = PROC_I(inode)->op.proc_get_link(inode, &de, &mnt);
        if (error)
                goto out;
 
@@ -570,7 +576,7 @@ static struct pid_entry base_stuff[] = {
 static int proc_readfd(struct file * filp, void * dirent, filldir_t filldir)
 {
        struct inode *inode = filp->f_dentry->d_inode;
-       struct task_struct *p = inode->u.proc_i.task;
+       struct task_struct *p = proc_task(inode);
        unsigned int fd, pid, ino;
        int retval;
        char buf[NUMBUF];
@@ -598,6 +604,7 @@ static int proc_readfd(struct file * filp, void * dirent, filldir_t filldir)
                        task_unlock(p);
                        if (!files)
                                goto out;
+                       read_lock(&files->file_lock);
                        for (fd = filp->f_pos-2;
                             fd < files->max_fds;
                             fd++, filp->f_pos++) {
@@ -605,6 +612,7 @@ static int proc_readfd(struct file * filp, void * dirent, filldir_t filldir)
 
                                if (!fcheck_files(files, fd))
                                        continue;
+                               read_unlock(&files->file_lock);
 
                                j = NUMBUF;
                                i = fd;
@@ -617,7 +625,9 @@ static int proc_readfd(struct file * filp, void * dirent, filldir_t filldir)
                                ino = fake_ino(pid, PROC_PID_FD_DIR + fd);
                                if (filldir(dirent, buf+j, NUMBUF-j, fd+2, ino, DT_LNK) < 0)
                                        break;
+                               read_lock(&files->file_lock);
                        }
+                       read_unlock(&files->file_lock);
                        put_files_struct(files);
        }
 out:
@@ -632,7 +642,7 @@ static int proc_base_readdir(struct file * filp,
        struct inode *inode = filp->f_dentry->d_inode;
        struct pid_entry *p;
 
-       pid = inode->u.proc_i.task->pid;
+       pid = proc_task(inode)->pid;
        if (!pid)
                return -ENOENT;
        i = filp->f_pos;
@@ -684,6 +694,7 @@ static int task_dumpable(struct task_struct *task)
 static struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *task, int ino)
 {
        struct inode * inode;
+       struct proc_inode *ei;
 
        /* We need a new inode */
        
@@ -692,7 +703,9 @@ static struct inode *proc_pid_make_inode(struct super_block * sb, struct task_st
                goto out;
 
        /* Common stuff */
-
+       ei = PROC_I(inode);
+       ei->task = NULL;
+       ei->file = NULL;
        inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
        inode->i_ino = fake_ino(task->pid, ino);
 
@@ -703,7 +716,7 @@ static struct inode *proc_pid_make_inode(struct super_block * sb, struct task_st
         * grab the reference to task.
         */
        get_task_struct(task);
-       inode->u.proc_i.task = task;
+       ei->task = task;
        inode->i_uid = 0;
        inode->i_gid = 0;
        if (ino == PROC_PID_INO || task_dumpable(task)) {
@@ -733,7 +746,7 @@ static int pid_fd_revalidate(struct dentry * dentry, int flags)
  */
 static int pid_base_revalidate(struct dentry * dentry, int flags)
 {
-       if (dentry->d_inode->u.proc_i.task->pid)
+       if (proc_task(dentry->d_inode)->pid)
                return 1;
        d_drop(dentry);
        return 0;
@@ -767,10 +780,11 @@ static struct dentry_operations pid_base_dentry_operations =
 static struct dentry *proc_lookupfd(struct inode * dir, struct dentry * dentry)
 {
        unsigned int fd, c;
-       struct task_struct *task = dir->u.proc_i.task;
+       struct task_struct *task = proc_task(dir);
        struct file * file;
        struct files_struct * files;
        struct inode *inode;
+       struct proc_inode *ei;
        const char *name;
        int len;
 
@@ -792,6 +806,7 @@ static struct dentry *proc_lookupfd(struct inode * dir, struct dentry * dentry)
        inode = proc_pid_make_inode(dir->i_sb, task, PROC_PID_FD_DIR+fd);
        if (!inode)
                goto out;
+       ei = PROC_I(inode);
        task_lock(task);
        files = task->files;
        if (files)
@@ -800,7 +815,7 @@ static struct dentry *proc_lookupfd(struct inode * dir, struct dentry * dentry)
        if (!files)
                goto out_unlock;
        read_lock(&files->file_lock);
-       file = inode->u.proc_i.file = fcheck_files(files, fd);
+       file = ei->file = fcheck_files(files, fd);
        if (!file)
                goto out_unlock2;
        get_file(file);
@@ -809,7 +824,7 @@ static struct dentry *proc_lookupfd(struct inode * dir, struct dentry * dentry)
        inode->i_op = &proc_pid_link_inode_operations;
        inode->i_size = 64;
        inode->i_mode = S_IFLNK;
-       inode->u.proc_i.op.proc_get_link = proc_fd_link;
+       ei->op.proc_get_link = proc_fd_link;
        if (file->f_mode & 1)
                inode->i_mode |= S_IRUSR | S_IXUSR;
        if (file->f_mode & 2)
@@ -844,8 +859,9 @@ static struct dentry *proc_base_lookup(struct inode *dir, struct dentry *dentry)
 {
        struct inode *inode;
        int error;
-       struct task_struct *task = dir->u.proc_i.task;
+       struct task_struct *task = proc_task(dir);
        struct pid_entry *p;
+       struct proc_inode *ei;
 
        error = -ENOENT;
        inode = NULL;
@@ -864,6 +880,7 @@ static struct dentry *proc_base_lookup(struct inode *dir, struct dentry *dentry)
        if (!inode)
                goto out;
 
+       ei = PROC_I(inode);
        inode->i_mode = p->mode;
        /*
         * Yes, it does not scale. And it should not. Don't add
@@ -877,35 +894,35 @@ static struct dentry *proc_base_lookup(struct inode *dir, struct dentry *dentry)
                        break;
                case PROC_PID_EXE:
                        inode->i_op = &proc_pid_link_inode_operations;
-                       inode->u.proc_i.op.proc_get_link = proc_exe_link;
+                       ei->op.proc_get_link = proc_exe_link;
                        break;
                case PROC_PID_CWD:
                        inode->i_op = &proc_pid_link_inode_operations;
-                       inode->u.proc_i.op.proc_get_link = proc_cwd_link;
+                       ei->op.proc_get_link = proc_cwd_link;
                        break;
                case PROC_PID_ROOT:
                        inode->i_op = &proc_pid_link_inode_operations;
-                       inode->u.proc_i.op.proc_get_link = proc_root_link;
+                       ei->op.proc_get_link = proc_root_link;
                        break;
                case PROC_PID_ENVIRON:
                        inode->i_fop = &proc_info_file_operations;
-                       inode->u.proc_i.op.proc_read = proc_pid_environ;
+                       ei->op.proc_read = proc_pid_environ;
                        break;
                case PROC_PID_STATUS:
                        inode->i_fop = &proc_info_file_operations;
-                       inode->u.proc_i.op.proc_read = proc_pid_status;
+                       ei->op.proc_read = proc_pid_status;
                        break;
                case PROC_PID_STAT:
                        inode->i_fop = &proc_info_file_operations;
-                       inode->u.proc_i.op.proc_read = proc_pid_stat;
+                       ei->op.proc_read = proc_pid_stat;
                        break;
                case PROC_PID_CMDLINE:
                        inode->i_fop = &proc_info_file_operations;
-                       inode->u.proc_i.op.proc_read = proc_pid_cmdline;
+                       ei->op.proc_read = proc_pid_cmdline;
                        break;
                case PROC_PID_STATM:
                        inode->i_fop = &proc_info_file_operations;
-                       inode->u.proc_i.op.proc_read = proc_pid_statm;
+                       ei->op.proc_read = proc_pid_statm;
                        break;
                case PROC_PID_MAPS:
                        inode->i_fop = &proc_maps_operations;
@@ -913,7 +930,7 @@ static struct dentry *proc_base_lookup(struct inode *dir, struct dentry *dentry)
 #ifdef CONFIG_SMP
                case PROC_PID_CPU:
                        inode->i_fop = &proc_info_file_operations;
-                       inode->u.proc_i.op.proc_read = proc_pid_cpu;
+                       ei->op.proc_read = proc_pid_cpu;
                        break;
 #endif
                case PROC_PID_MEM:
@@ -973,6 +990,7 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry)
        struct task_struct *task;
        const char *name;
        struct inode *inode;
+       struct proc_inode *ei;
        int len;
 
        pid = 0;
@@ -982,10 +1000,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry)
                inode = new_inode(dir->i_sb);
                if (!inode)
                        return ERR_PTR(-ENOMEM);
+               ei = PROC_I(inode);
                inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
                inode->i_ino = fake_ino(0, PROC_PID_INO);
-               inode->u.proc_i.file = NULL;
-               inode->u.proc_i.task = NULL;
+               ei->file = NULL;
+               ei->task = NULL;
                inode->i_mode = S_IFLNK|S_IRWXUGO;
                inode->i_uid = inode->i_gid = 0;
                inode->i_size = 64;
@@ -1035,10 +1054,10 @@ out:
 
 void proc_pid_delete_inode(struct inode *inode)
 {
-       if (inode->u.proc_i.file)
-               fput(inode->u.proc_i.file);
-       if (inode->u.proc_i.task)
-               free_task_struct(inode->u.proc_i.task);
+       if (PROC_I(inode)->file)
+               fput(PROC_I(inode)->file);
+       if (proc_task(inode))
+               free_task_struct(proc_task(inode));
 }
 
 #define PROC_NUMBUF 10

diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index 3e31f65e266bf87b94dde94a27df605aa007b557..f50b13026f2732d9dfbc442208fa918eb082b449 100644 (file)
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -58,7 +58,7 @@ proc_file_read(struct file * file, char * buf, size_t nbytes, loff_t *ppos)
        char    *start;
        struct proc_dir_entry * dp;
 
-       dp = (struct proc_dir_entry *) inode->u.generic_ip;
+       dp = PDE(inode);
        if (!(page = (char*) __get_free_page(GFP_KERNEL)))
                return -ENOMEM;
 
@@ -128,7 +128,7 @@ proc_file_write(struct file * file, const char * buffer,
        struct inode *inode = file->f_dentry->d_inode;
        struct proc_dir_entry * dp;
        
-       dp = (struct proc_dir_entry *) inode->u.generic_ip;
+       dp = PDE(inode);
 
        if (!dp->write_proc)
                return -EIO;
@@ -221,13 +221,13 @@ out:
 
 static int proc_readlink(struct dentry *dentry, char *buffer, int buflen)
 {
-       char *s=((struct proc_dir_entry *)dentry->d_inode->u.generic_ip)->data;
+       char *s=PDE(dentry->d_inode)->data;
        return vfs_readlink(dentry, buffer, buflen, s);
 }
 
 static int proc_follow_link(struct dentry *dentry, struct nameidata *nd)
 {
-       char *s=((struct proc_dir_entry *)dentry->d_inode->u.generic_ip)->data;
+       char *s=PDE(dentry->d_inode)->data;
        return vfs_follow_link(nd, s);
 }
 
@@ -264,7 +264,7 @@ struct dentry *proc_lookup(struct inode * dir, struct dentry *dentry)
 
        error = -ENOENT;
        inode = NULL;
-       de = (struct proc_dir_entry *) dir->u.generic_ip;
+       de = PDE(dir);
        if (de) {
                for (de = de->subdir; de ; de = de->next) {
                        if (!de || !de->low_ino)
@@ -306,7 +306,7 @@ int proc_readdir(struct file * filp,
        struct inode *inode = filp->f_dentry->d_inode;
 
        ino = inode->i_ino;
-       de = (struct proc_dir_entry *) inode->u.generic_ip;
+       de = PDE(inode);
        if (!de)
                return -EINVAL;
        i = filp->f_pos;
@@ -413,7 +413,7 @@ static void proc_kill_inodes(struct proc_dir_entry *de)
                if (dentry->d_op != &proc_dentry_operations)
                        continue;
                inode = dentry->d_inode;
-               if (inode->u.generic_ip != de)
+               if (PDE(inode) != de)
                        continue;
                fops = filp->f_op;
                filp->f_op = NULL;

diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index 8af8a6868e927f33e4dd4d6114855bfaee8cc70a..b670f91ca023011c029e7afd4bc03f9712a3ca73 100644 (file)
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -58,7 +58,7 @@ void de_put(struct proc_dir_entry *de)
  */
 static void proc_delete_inode(struct inode *inode)
 {
-       struct proc_dir_entry *de = inode->u.generic_ip;
+       struct proc_dir_entry *de = PDE(inode);
 
        inode->i_state = I_CLEAR;
 
@@ -91,14 +91,51 @@ static int proc_statfs(struct super_block *sb, struct statfs *buf)
        return 0;
 }
 
+static kmem_cache_t * proc_inode_cachep;
+
+static struct inode *proc_alloc_inode(struct super_block *sb)
+{
+       struct proc_inode *ei;
+       ei = (struct proc_inode *)kmem_cache_alloc(proc_inode_cachep, SLAB_KERNEL);
+       if (!ei)
+               return NULL;
+       return &ei->vfs_inode;
+}
+
+static void proc_destroy_inode(struct inode *inode)
+{
+       kmem_cache_free(proc_inode_cachep, PROC_I(inode));
+}
+
+static void init_once(void * foo, kmem_cache_t * cachep, unsigned long flags)
+{
+       struct proc_inode *ei = (struct proc_inode *) foo;
+
+       if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==
+           SLAB_CTOR_CONSTRUCTOR)
+               inode_init_once(&ei->vfs_inode);
+}
+ 
+int __init proc_init_inodecache(void)
+{
+       proc_inode_cachep = kmem_cache_create("proc_inode_cache",
+                                            sizeof(struct proc_inode),
+                                            0, SLAB_HWCACHE_ALIGN,
+                                            init_once, NULL);
+       if (proc_inode_cachep == NULL)
+               return -ENOMEM;
+       return 0;
+}
+
 static struct super_operations proc_sops = { 
+       alloc_inode:    proc_alloc_inode,
+       destroy_inode:  proc_destroy_inode,
        read_inode:     proc_read_inode,
        put_inode:      force_delete,
        delete_inode:   proc_delete_inode,
        statfs:         proc_statfs,
 };
 
-
 static int parse_options(char *options,uid_t *uid,gid_t *gid)
 {
        char *this_char,*value;
@@ -147,7 +184,7 @@ printk("proc_iget: using deleted entry %s, count=%d\n", de->name, atomic_read(&d
        if (!inode)
                goto out_fail;
        
-       inode->u.generic_ip = (void *) de;
+       PROC_I(inode)->pde = de;
        if (de) {
                if (de->mode) {
                        inode->i_mode = de->mode;

diff --git a/fs/proc/root.c b/fs/proc/root.c
index 3db40a53bc0f39ff83e4dbadfea35ee4669bb021..447bb7cc84bb54835a4df3a0dff4cceeeb3b62d0 100644 (file)
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -25,9 +25,13 @@ struct proc_dir_entry *proc_sys_root;
 
 static DECLARE_FSTYPE(proc_fs_type, "proc", proc_read_super, FS_SINGLE);
 
+extern int __init proc_init_inodecache(void);
 void __init proc_root_init(void)
 {
-       int err = register_filesystem(&proc_fs_type);
+       int err = proc_init_inodecache();
+       if (err)
+               return;
+       err = register_filesystem(&proc_fs_type);
        if (err)
                return;
        proc_mnt = kern_mount(&proc_fs_type);

diff --git a/include/linux/fs.h b/include/linux/fs.h
index b150576116ce1d0633ab0a73f04cd90d343caa43..5fa0e8f61911c31fb9f0ab86afeb4b32da7a4d4b 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -289,7 +289,6 @@ extern void set_bh_page(struct buffer_head *bh, struct page *page, unsigned long
 #include <linux/pipe_fs_i.h>
 /* #include <linux/umsdos_fs_i.h> */
 #include <linux/romfs_fs_i.h>
-#include <linux/proc_fs_i.h>
 #include <linux/cramfs_fs_sb.h>
 
 /*
@@ -455,7 +454,6 @@ struct inode {
        union {
                /* struct umsdos_inode_info     umsdos_i; */
                struct romfs_inode_info         romfs_i;
-               struct proc_inode_info          proc_i;
                void                            *generic_ip;
        } u;
 };

diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
index 4688c8c90ede0fb44159c3bde3bcd40b1c657d64..3f9e4c2c60e12498f96744df7de92cfd23fdfb9d 100644 (file)
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
@@ -205,4 +205,26 @@ extern struct proc_dir_entry proc_root;
 
 #endif /* CONFIG_PROC_FS */
 
+struct proc_inode {
+       struct task_struct *task;
+       int type;
+       union {
+               int (*proc_get_link)(struct inode *, struct dentry **, struct vfsmount **);
+               int (*proc_read)(struct task_struct *task, char *page);
+       } op;
+       struct file *file;
+       struct proc_dir_entry *pde;
+       struct inode vfs_inode;
+};
+
+static inline struct proc_inode *PROC_I(struct inode *inode)
+{
+       return list_entry(inode, struct proc_inode, vfs_inode);
+}
+
+static inline struct proc_dir_entry *PDE(struct inode *inode)
+{
+       return PROC_I(inode)->pde;
+}
+
 #endif /* _LINUX_PROC_FS_H */

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 9035ae798d0ebcfa27cc6fc3c73d589d9e2ae536..21a5c8fe6543130cb3e0507f3585df7e0ea4068c 100644 (file)
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -677,7 +677,7 @@ static ssize_t do_rw_proc(int write, struct file * file, char * buf,
        size_t res;
        ssize_t error;
        
-       de = (struct proc_dir_entry*) file->f_dentry->d_inode->u.generic_ip;
+       de = PDE(file->f_dentry->d_inode);
        if (!de || !de->data)
                return -ENOTDIR;
        table = (struct ctl_table *) de->data;

diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c
index 5c994e1a1257e9545ae41038870e7caf816d7a4e..c8482f9ab40f66fb5ea993905761096e6934b56e 100644 (file)
--- a/net/8021q/vlanproc.c
+++ b/net/8021q/vlanproc.c
@@ -236,7 +236,7 @@ static ssize_t vlan_proc_read(struct file *file, char *buf,
        if (count <= 0)
                return 0;
 
-       dent = inode->u.generic_ip;
+       dent = PDE(inode);
        if ((dent == NULL) || (dent->get_info == NULL))
                return 0;
 

diff --git a/net/atm/proc.c b/net/atm/proc.c
index 3fdd52372ea00ee66582f1173df2b7ed6df758d1..e19a6a69a0a40a7ee16a46a1970eae9a7653a20d 100644 (file)
--- a/net/atm/proc.c
+++ b/net/atm/proc.c
@@ -498,8 +498,7 @@ static ssize_t proc_dev_atm_read(struct file *file,char *buf,size_t count,
        if (count == 0) return 0;
        page = get_free_page(GFP_KERNEL);
        if (!page) return -ENOMEM;
-       dev = ((struct proc_dir_entry *) file->f_dentry->d_inode->u.generic_ip)
-           ->data;
+       dev = PDE(file->f_dentry->d_inode)->data;
        if (!dev->ops->proc_read)
                length = -EINVAL;
        else {
@@ -521,8 +520,7 @@ static ssize_t proc_spec_atm_read(struct file *file,char *buf,size_t count,
        unsigned long page;
        int length;
        int (*info)(loff_t,char *);
-       info = ((struct proc_dir_entry *) file->f_dentry->d_inode->u.generic_ip)
-           ->data;
+       info = PDE(file->f_dentry->d_inode)->data;
 
        if (count == 0) return 0;
        page = get_free_page(GFP_KERNEL);

diff --git a/net/wanrouter/wanmain.c b/net/wanrouter/wanmain.c
index b58338f52f06fb8c53bf8f2c8bf3f3d1e03bf688..38838887c22db005afa133da164b487434c74c35 100644 (file)
--- a/net/wanrouter/wanmain.c
+++ b/net/wanrouter/wanmain.c
@@ -500,7 +500,7 @@ int wanrouter_ioctl(struct inode *inode, struct file *file,
        if ((cmd >> 8) != ROUTER_IOCTL)
                return -EINVAL;
                
-       dent = inode->u.generic_ip;
+       dent = PDE(inode);
        if ((dent == NULL) || (dent->data == NULL))
                return -EINVAL;
                

diff --git a/net/wanrouter/wanproc.c b/net/wanrouter/wanproc.c
index 14cf0257f28c727cceb4ccc058dc81fd6004743d..51b0f8b18c9be229d4cd72d1dfd3a5b01596c5a3 100644 (file)
--- a/net/wanrouter/wanproc.c
+++ b/net/wanrouter/wanproc.c
@@ -248,7 +248,7 @@ typedef struct wan_stat_entry
                if (count <= 0)
                        return 0;
                        
-               dent = inode->u.generic_ip;
+               dent = PDE(inode);
                if ((dent == NULL) || (dent->get_info == NULL))
                        return 0;
                        
@@ -794,7 +794,7 @@ typedef struct wan_stat_entry
                if (count <= 0)
                        return 0;
                        
-               dent = inode->u.generic_ip;
+               dent = PDE(inode);
                if ((dent == NULL) || (dent->get_info == NULL))
                        return 0;
                        
@@ -828,7 +828,7 @@ typedef struct wan_stat_entry
 
                if (count <= 0)
                        return 0;
-               dent = inode->u.generic_ip;
+               dent = PDE(inode);
                if ((dent == NULL) || (dent->get_info == NULL))
                        return -ENODATA;
                err = verify_area(VERIFY_WRITE, buf, count);
@@ -1068,7 +1068,7 @@ static int device_write(
 
         if (err) return err;
 
-        dent = inode->u.generic_ip;
+        dent = PDE(inode);
         if ((dent == NULL) || (dent->data == NULL))
                 return -ENODATA;