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

[~andy/linux] / net / sunrpc / auth_gss / svcauth_gss.c

diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
index b1924e53e8c7251cba9ff5bcb69dfd9a28b650dd..871c73c921654b14b14eface6b4f2cfe0f27d5d2 100644 (file)
--- a/net/sunrpc/auth_gss/svcauth_gss.c
+++ b/net/sunrpc/auth_gss/svcauth_gss.c
@@ -1328,7 +1328,7 @@ static int wait_for_gss_proxy(struct net *net)
 static ssize_t write_gssp(struct file *file, const char __user *buf,
                         size_t count, loff_t *ppos)
 {
-       struct net *net = PDE(file->f_path.dentry->d_inode)->data;
+       struct net *net = PDE_DATA(file->f_path.dentry->d_inode);
        char tbuf[20];
        unsigned long i;
        int res;
@@ -1356,7 +1356,7 @@ static ssize_t write_gssp(struct file *file, const char __user *buf,
 static ssize_t read_gssp(struct file *file, char __user *buf,
                         size_t count, loff_t *ppos)
 {
-       struct net *net = PDE(file->f_path.dentry->d_inode)->data;
+       struct net *net = PDE_DATA(file->f_path.dentry->d_inode);
        unsigned long p = *ppos;
        char tbuf[10];
        size_t len;