Merge branch 'for-3.10' of git://linux-nfs.org/~bfields/linux

[karo-tx-linux.git] / net / sunrpc / cache.c

diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
index 1d3c5144a331b5d9b4966be701dfb960ad945456..80fe5c86efd1265a770a5c9a84f0cad3e78b4940 100644 (file)
--- a/net/sunrpc/cache.c
+++ b/net/sunrpc/cache.c
@@ -1210,7 +1210,6 @@ EXPORT_SYMBOL_GPL(sunrpc_cache_pipe_upcall);
  * key and content are both parsed by cache
  */
 
-#define isodigit(c) (isdigit(c) && c <= '7')
 int qword_get(char **bpp, char *dest, int bufsize)
 {
        /* return bytes copied, or -1 on error */
@@ -1463,7 +1462,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);
 }
@@ -1471,14 +1470,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);
 }
@@ -1487,21 +1486,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);
 }
@@ -1519,14 +1518,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);
 }
@@ -1540,14 +1539,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);
 }
@@ -1555,7 +1554,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);
 }
@@ -1564,7 +1563,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);
 }