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>

1 files changed, 5 insertions, 13 deletions

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;