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>

2 files changed, 13 insertions, 13 deletions

diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
index 25d58e766014..d9828b6799a3 100644
--- a/net/sunrpc/cache.c
+++ b/net/sunrpc/cache.c
@@ -1461,7 +1461,7 @@ static ssize_t write_flush(struct file *file, const char __user *buf,
 static ssize_t cache_read_procfs(struct file *filp, char __user *buf,
                                  size_t count, loff_t *ppos)
 {
-        struct cache_detail *cd = PDE(file_inode(filp))->data;
+        struct cache_detail *cd = PDE_DATA(file_inode(filp));
 
         return cache_read(filp, buf, count, ppos, cd);
 }
@@ -1469,14 +1469,14 @@ static ssize_t cache_read_procfs(struct file *filp, char __user *buf,
 static ssize_t cache_write_procfs(struct file *filp, const char __user *buf,
                                   size_t count, loff_t *ppos)
 {
-        struct cache_detail *cd = PDE(file_inode(filp))->data;
+        struct cache_detail *cd = PDE_DATA(file_inode(filp));
 
         return cache_write(filp, buf, count, ppos, cd);
 }
 
 static unsigned int cache_poll_procfs(struct file *filp, poll_table *wait)
 {
-        struct cache_detail *cd = PDE(file_inode(filp))->data;
+        struct cache_detail *cd = PDE_DATA(file_inode(filp));
 
         return cache_poll(filp, wait, cd);
 }
@@ -1485,21 +1485,21 @@ static long cache_ioctl_procfs(struct file *filp,
                                unsigned int cmd, unsigned long arg)
 {
         struct inode *inode = file_inode(filp);
-        struct cache_detail *cd = PDE(inode)->data;
+        struct cache_detail *cd = PDE_DATA(inode);
 
         return cache_ioctl(inode, filp, cmd, arg, cd);
 }
 
 static int cache_open_procfs(struct inode *inode, struct file *filp)
 {
-        struct cache_detail *cd = PDE(inode)->data;
+        struct cache_detail *cd = PDE_DATA(inode);
 
         return cache_open(inode, filp, cd);
 }
 
 static int cache_release_procfs(struct inode *inode, struct file *filp)
 {
-        struct cache_detail *cd = PDE(inode)->data;
+        struct cache_detail *cd = PDE_DATA(inode);
 
         return cache_release(inode, filp, cd);
 }
@@ -1517,14 +1517,14 @@ static const struct file_operations cache_file_operations_procfs = {
 
 static int content_open_procfs(struct inode *inode, struct file *filp)
 {
-        struct cache_detail *cd = PDE(inode)->data;
+        struct cache_detail *cd = PDE_DATA(inode);
 
         return content_open(inode, filp, cd);
 }
 
 static int content_release_procfs(struct inode *inode, struct file *filp)
 {
-        struct cache_detail *cd = PDE(inode)->data;
+        struct cache_detail *cd = PDE_DATA(inode);
 
         return content_release(inode, filp, cd);
 }
@@ -1538,14 +1538,14 @@ static const struct file_operations content_file_operations_procfs = {
 
 static int open_flush_procfs(struct inode *inode, struct file *filp)
 {
-        struct cache_detail *cd = PDE(inode)->data;
+        struct cache_detail *cd = PDE_DATA(inode);
 
         return open_flush(inode, filp, cd);
 }
 
 static int release_flush_procfs(struct inode *inode, struct file *filp)
 {
-        struct cache_detail *cd = PDE(inode)->data;
+        struct cache_detail *cd = PDE_DATA(inode);
 
         return release_flush(inode, filp, cd);
 }
@@ -1553,7 +1553,7 @@ static int release_flush_procfs(struct inode *inode, struct file *filp)
 static ssize_t read_flush_procfs(struct file *filp, char __user *buf,
                             size_t count, loff_t *ppos)
 {
-        struct cache_detail *cd = PDE(file_inode(filp))->data;
+        struct cache_detail *cd = PDE_DATA(file_inode(filp));
 
         return read_flush(filp, buf, count, ppos, cd);
 }
@@ -1562,7 +1562,7 @@ static ssize_t write_flush_procfs(struct file *filp,
                                   const char __user *buf,
                                   size_t count, loff_t *ppos)
 {
-        struct cache_detail *cd = PDE(file_inode(filp))->data;
+        struct cache_detail *cd = PDE_DATA(file_inode(filp));
 
         return write_flush(filp, buf, count, ppos, cd);
 }
diff --git a/net/sunrpc/stats.c b/net/sunrpc/stats.c
index bc2068ee795b..21b75cb08c03 100644
--- a/net/sunrpc/stats.c
+++ b/net/sunrpc/stats.c
@@ -64,7 +64,7 @@ static int rpc_proc_show(struct seq_file *seq, void *v) {
 
 static int rpc_proc_open(struct inode *inode, struct file *file)
 {
-        return single_open(file, rpc_proc_show, PDE(inode)->data);
+        return single_open(file, rpc_proc_show, PDE_DATA(inode));
 }
 
 static const struct file_operations rpc_proc_fops = {