procfs: new helper - PDE_DATA(inode)

The only part of proc_dir_entry the code outside of fs/proc
really cares about is PDE(inode)->data.  Provide a helper
for that; static inline for now, eventually will be moved
to fs/proc, along with the knowledge of struct proc_dir_entry
layout.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

11 files changed, 27 insertions, 43 deletions

diff --git a/arch/alpha/kernel/srm_env.c b/arch/alpha/kernel/srm_env.c
index e64559f0a82d..ef8769b6c98b 100644
--- a/arch/alpha/kernel/srm_env.c
+++ b/arch/alpha/kernel/srm_env.c
@@ -104,14 +104,14 @@ static int srm_env_proc_show(struct seq_file *m, void *v)
 
 static int srm_env_proc_open(struct inode *inode, struct file *file)
 {
-        return single_open(file, srm_env_proc_show, PDE(inode)->data);
+        return single_open(file, srm_env_proc_show, PDE_DATA(inode));
 }
 
 static ssize_t srm_env_proc_write(struct file *file, const char __user *buffer,
                                   size_t count, loff_t *pos)
 {
         int res;
-        srm_env_t       *entry = PDE(file_inode(file))->data;
+        srm_env_t       *entry = PDE_DATA(file_inode(file));
         char            *buf = (char *) __get_free_page(GFP_USER);
         unsigned long   ret1, ret2;
 
diff --git a/arch/arm/kernel/atags_proc.c b/arch/arm/kernel/atags_proc.c
index 8c00f75bf1ab..c7ff8073416f 100644
--- a/arch/arm/kernel/atags_proc.c
+++ b/arch/arm/kernel/atags_proc.c
@@ -12,7 +12,7 @@ struct buffer {
 static ssize_t atags_read(struct file *file, char __user *buf,
                           size_t count, loff_t *ppos)
 {
-        struct buffer *b = PDE(file_inode(file))->data;
+        struct buffer *b = PDE_DATA(file_inode(file));
         return simple_read_from_buffer(buf, count, ppos, b->data, b->size);
 }
 
diff --git a/arch/blackfin/kernel/cplbinfo.c b/arch/blackfin/kernel/cplbinfo.c
index e1d0b24c6070..404045dcc5e4 100644
--- a/arch/blackfin/kernel/cplbinfo.c
+++ b/arch/blackfin/kernel/cplbinfo.c
@@ -116,14 +116,12 @@ static const struct seq_operations cplbinfo_sops = {
 
 static int cplbinfo_open(struct inode *inode, struct file *file)
 {
-        struct proc_dir_entry *pde = PDE(file_inode(file));
         char cplb_type;
-        unsigned int cpu;
+        unsigned int cpu = (unsigned long)PDE_DATA(file_inode(file));
         int ret;
         struct seq_file *m;
         struct cplbinfo_data *cdata;
 
-        cpu = (unsigned int)pde->data;
         cplb_type = cpu & CPLBINFO_DCPLB_FLAG ? 'D' : 'I';
         cpu &= ~CPLBINFO_DCPLB_FLAG;
 
diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c
index aa527d7e91f2..a97d75b9c5ec 100644
--- a/arch/ia64/kernel/salinfo.c
+++ b/arch/ia64/kernel/salinfo.c
@@ -301,9 +301,7 @@ salinfo_event_open(struct inode *inode, struct file *file)
 static ssize_t
 salinfo_event_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
 {
-        struct inode *inode = file_inode(file);
-        struct proc_dir_entry *entry = PDE(inode);
-        struct salinfo_data *data = entry->data;
+        struct salinfo_data *data = PDE_DATA(file_inode(file));
         char cmd[32];
         size_t size;
         int i, n, cpu = -1;
@@ -360,8 +358,7 @@ static const struct file_operations salinfo_event_fops = {
 static int
 salinfo_log_open(struct inode *inode, struct file *file)
 {
-        struct proc_dir_entry *entry = PDE(inode);
-        struct salinfo_data *data = entry->data;
+        struct salinfo_data *data = PDE_DATA(inode);
 
         if (!capable(CAP_SYS_ADMIN))
                 return -EPERM;
@@ -386,8 +383,7 @@ salinfo_log_open(struct inode *inode, struct file *file)
 static int
 salinfo_log_release(struct inode *inode, struct file *file)
 {
-        struct proc_dir_entry *entry = PDE(inode);
-        struct salinfo_data *data = entry->data;
+        struct salinfo_data *data = PDE_DATA(inode);
 
         if (data->state == STATE_NO_DATA) {
                 vfree(data->log_buffer);
@@ -463,9 +459,7 @@ retry:
 static ssize_t
 salinfo_log_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
 {
-        struct inode *inode = file_inode(file);
-        struct proc_dir_entry *entry = PDE(inode);
-        struct salinfo_data *data = entry->data;
+        struct salinfo_data *data = PDE_DATA(file_inode(file));
         u8 *buf;
         u64 bufsize;
 
@@ -524,9 +518,7 @@ salinfo_log_clear(struct salinfo_data *data, int cpu)
 static ssize_t
 salinfo_log_write(struct file *file, const char __user *buffer, size_t count, loff_t *ppos)
 {
-        struct inode *inode = file_inode(file);
-        struct proc_dir_entry *entry = PDE(inode);
-        struct salinfo_data *data = entry->data;
+        struct salinfo_data *data = PDE_DATA(file_inode(file));
         char cmd[32];
         size_t size;
         u32 offset;
diff --git a/arch/mips/lasat/picvue_proc.c b/arch/mips/lasat/picvue_proc.c
index c592bc8b8c99..638c5db122c9 100644
--- a/arch/mips/lasat/picvue_proc.c
+++ b/arch/mips/lasat/picvue_proc.c
@@ -58,13 +58,13 @@ static int pvc_line_proc_show(struct seq_file *m, void *v)
 
 static int pvc_line_proc_open(struct inode *inode, struct file *file)
 {
-        return single_open(file, pvc_line_proc_show, PDE(inode)->data);
+        return single_open(file, pvc_line_proc_show, PDE_DATA(inode));
 }
 
 static ssize_t pvc_line_proc_write(struct file *file, const char __user *buf,
                                    size_t count, loff_t *pos)
 {
-        int lineno = *(int *)PDE(file_inode(file))->data;
+        int lineno = *(int *)PDE_DATA(file_inode(file));
         char kbuf[PVC_LINELEN];
         size_t len;
 
diff --git a/arch/powerpc/kernel/proc_powerpc.c b/arch/powerpc/kernel/proc_powerpc.c
index f19d0bdc3241..41d8ee9c82f1 100644
--- a/arch/powerpc/kernel/proc_powerpc.c
+++ b/arch/powerpc/kernel/proc_powerpc.c
@@ -32,8 +32,6 @@
 static loff_t page_map_seek( struct file *file, loff_t off, int whence)
 {
         loff_t new;
-        struct proc_dir_entry *dp = PDE(file_inode(file));
-
         switch(whence) {
         case 0:
                 new = off;
@@ -42,12 +40,12 @@ static loff_t page_map_seek( struct file *file, loff_t off, int whence)
                 new = file->f_pos + off;
                 break;
         case 2:
-                new = dp->size + off;
+                new = PAGE_SIZE + off;
                 break;
         default:
                 return -EINVAL;
         }
-        if ( new < 0 || new > dp->size )
+        if ( new < 0 || new > PAGE_SIZE )
                 return -EINVAL;
         return (file->f_pos = new);
 }
@@ -55,19 +53,18 @@ static loff_t page_map_seek( struct file *file, loff_t off, int whence)
 static ssize_t page_map_read( struct file *file, char __user *buf, size_t nbytes,
                               loff_t *ppos)
 {
-        struct proc_dir_entry *dp = PDE(file_inode(file));
-        return simple_read_from_buffer(buf, nbytes, ppos, dp->data, dp->size);
+        return simple_read_from_buffer(buf, nbytes, ppos,
+                        PDE_DATA(file_inode(file)), PAGE_SIZE);
 }
 
 static int page_map_mmap( struct file *file, struct vm_area_struct *vma )
 {
-        struct proc_dir_entry *dp = PDE(file_inode(file));
-
-        if ((vma->vm_end - vma->vm_start) > dp->size)
+        if ((vma->vm_end - vma->vm_start) > PAGE_SIZE)
                 return -EINVAL;
 
-        remap_pfn_range(vma, vma->vm_start, __pa(dp->data) >> PAGE_SHIFT,
-                                                dp->size, vma->vm_page_prot);
+        remap_pfn_range(vma, vma->vm_start,
+                        __pa(PDE_DATA(file_inode(file))) >> PAGE_SHIFT,
+                        PAGE_SIZE, vma->vm_page_prot);
         return 0;
 }
 
diff --git a/arch/powerpc/platforms/pseries/scanlog.c b/arch/powerpc/platforms/pseries/scanlog.c
index 47f3cda2a68b..cc220d2061b2 100644
--- a/arch/powerpc/platforms/pseries/scanlog.c
+++ b/arch/powerpc/platforms/pseries/scanlog.c
@@ -46,8 +46,7 @@ static struct proc_dir_entry *proc_ppc64_scan_log_dump;	/* The proc file */
 static ssize_t scanlog_read(struct file *file, char __user *buf,
                             size_t count, loff_t *ppos)
 {
-        struct proc_dir_entry *dp = PDE(file_inode(file));
-        unsigned int *data = (unsigned int *)dp->data;
+        unsigned int *data = PDE_DATA(file_inode(file));
         int status;
         unsigned long len, off;
         unsigned int wait_time;
@@ -135,8 +134,7 @@ static ssize_t scanlog_write(struct file * file, const char __user * buf,
 
 static int scanlog_open(struct inode * inode, struct file * file)
 {
-        struct proc_dir_entry *dp = PDE(inode);
-        unsigned int *data = (unsigned int *)dp->data;
+        unsigned int *data = PDE_DATA(file_inode(file));
 
         if (data[0] != 0) {
                 /* This imperfect test stops a second copy of the
@@ -152,8 +150,7 @@ static int scanlog_open(struct inode * inode, struct file * file)
 
 static int scanlog_release(struct inode * inode, struct file * file)
 {
-        struct proc_dir_entry *dp = PDE(inode);
-        unsigned int *data = (unsigned int *)dp->data;
+        unsigned int *data = PDE_DATA(file_inode(file));
 
         data[0] = 0;
 
diff --git a/arch/sh/mm/alignment.c b/arch/sh/mm/alignment.c
index aea14855e656..ec2b25302427 100644
--- a/arch/sh/mm/alignment.c
+++ b/arch/sh/mm/alignment.c
@@ -140,7 +140,7 @@ static int alignment_proc_open(struct inode *inode, struct file *file)
 static ssize_t alignment_proc_write(struct file *file,
                 const char __user *buffer, size_t count, loff_t *pos)
 {
-        int *data = PDE(file_inode(file))->data;
+        int *data = PDE_DATA(file_inode(file));
         char mode;
 
         if (count > 0) {
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c
index 0f094db918c7..2096468de9b2 100644
--- a/arch/sparc/kernel/ioport.c
+++ b/arch/sparc/kernel/ioport.c
@@ -693,7 +693,7 @@ static int sparc_io_proc_show(struct seq_file *m, void *v)
 
 static int sparc_io_proc_open(struct inode *inode, struct file *file)
 {
-        return single_open(file, sparc_io_proc_show, PDE(inode)->data);
+        return single_open(file, sparc_io_proc_show, PDE_DATA(inode));
 }
 
 static const struct file_operations sparc_io_proc_fops = {
diff --git a/arch/tile/kernel/hardwall.c b/arch/tile/kernel/hardwall.c
index 20273ee37deb..38ac189d9575 100644
--- a/arch/tile/kernel/hardwall.c
+++ b/arch/tile/kernel/hardwall.c
@@ -914,7 +914,7 @@ static int hardwall_proc_show(struct seq_file *sf, void *v)
 static int hardwall_proc_open(struct inode *inode,
                               struct file *file)
 {
-        return single_open(file, hardwall_proc_show, PDE(inode)->data);
+        return single_open(file, hardwall_proc_show, PDE_DATA(inode));
 }
 
 static const struct file_operations hardwall_proc_fops = {
diff --git a/arch/xtensa/platforms/iss/simdisk.c b/arch/xtensa/platforms/iss/simdisk.c
index 47ccef7839c9..4a06d70ddf5e 100644
--- a/arch/xtensa/platforms/iss/simdisk.c
+++ b/arch/xtensa/platforms/iss/simdisk.c
@@ -217,7 +217,7 @@ static int simdisk_detach(struct simdisk *dev)
 static ssize_t proc_read_simdisk(struct file *file, char __user *buf,
                         size_t size, loff_t *ppos)
 {
-        struct simdisk *dev = PDE(file_inode(file))->data;
+        struct simdisk *dev = PDE_DATA(file_inode(file));
         char *s = dev->filename;
         if (s) {
                 ssize_t n = simple_read_from_buffer(buf, size, ppos,
@@ -234,7 +234,7 @@ static ssize_t proc_write_simdisk(struct file *file, const char __user *buf,
                         size_t size, loff_t *ppos)
 {
         char *tmp = kmalloc(count + 1, GFP_KERNEL);
-        struct simdisk *dev = PDE(file_inode(file))->data;
+        struct simdisk *dev = PDE_DATA(file_inode(file));
         int err;
 
         if (tmp == NULL)