aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJosef Sipek <jsipek@fsl.cs.sunysb.edu>2006-12-08 05:37:42 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 11:28:50 -0500
commit303b46bb77a4b1679fd39d7ab5597630743e0ff5 (patch)
tree92581d460c21dfccdd4458122c553c90ecbcb014 /net
parent1250ca4c8f48de482ec7c476cb024fe93ad1fbb3 (diff)
[PATCH] struct path: convert sunrpc
Signed-off-by: Josef Sipek <jsipek@fsl.cs.sunysb.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'net')
-rw-r--r--net/sunrpc/auth_gss/auth_gss.c2
-rw-r--r--net/sunrpc/cache.c10
-rw-r--r--net/sunrpc/rpc_pipe.c8
3 files changed, 10 insertions, 10 deletions
diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
index a02ecc1f230d..e1a104abb782 100644
--- a/net/sunrpc/auth_gss/auth_gss.c
+++ b/net/sunrpc/auth_gss/auth_gss.c
@@ -501,7 +501,7 @@ gss_pipe_downcall(struct file *filp, const char __user *src, size_t mlen)
501 if (!buf) 501 if (!buf)
502 goto out; 502 goto out;
503 503
504 clnt = RPC_I(filp->f_dentry->d_inode)->private; 504 clnt = RPC_I(filp->f_path.dentry->d_inode)->private;
505 err = -EFAULT; 505 err = -EFAULT;
506 if (copy_from_user(buf, src, mlen)) 506 if (copy_from_user(buf, src, mlen))
507 goto err; 507 goto err;
diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
index d96fd466a9a4..80aff0474572 100644
--- a/net/sunrpc/cache.c
+++ b/net/sunrpc/cache.c
@@ -670,7 +670,7 @@ cache_read(struct file *filp, char __user *buf, size_t count, loff_t *ppos)
670{ 670{
671 struct cache_reader *rp = filp->private_data; 671 struct cache_reader *rp = filp->private_data;
672 struct cache_request *rq; 672 struct cache_request *rq;
673 struct cache_detail *cd = PDE(filp->f_dentry->d_inode)->data; 673 struct cache_detail *cd = PDE(filp->f_path.dentry->d_inode)->data;
674 int err; 674 int err;
675 675
676 if (count == 0) 676 if (count == 0)
@@ -747,7 +747,7 @@ cache_write(struct file *filp, const char __user *buf, size_t count,
747 loff_t *ppos) 747 loff_t *ppos)
748{ 748{
749 int err; 749 int err;
750 struct cache_detail *cd = PDE(filp->f_dentry->d_inode)->data; 750 struct cache_detail *cd = PDE(filp->f_path.dentry->d_inode)->data;
751 751
752 if (count == 0) 752 if (count == 0)
753 return 0; 753 return 0;
@@ -778,7 +778,7 @@ cache_poll(struct file *filp, poll_table *wait)
778 unsigned int mask; 778 unsigned int mask;
779 struct cache_reader *rp = filp->private_data; 779 struct cache_reader *rp = filp->private_data;
780 struct cache_queue *cq; 780 struct cache_queue *cq;
781 struct cache_detail *cd = PDE(filp->f_dentry->d_inode)->data; 781 struct cache_detail *cd = PDE(filp->f_path.dentry->d_inode)->data;
782 782
783 poll_wait(filp, &queue_wait, wait); 783 poll_wait(filp, &queue_wait, wait);
784 784
@@ -1254,7 +1254,7 @@ static struct file_operations content_file_operations = {
1254static ssize_t read_flush(struct file *file, char __user *buf, 1254static ssize_t read_flush(struct file *file, char __user *buf,
1255 size_t count, loff_t *ppos) 1255 size_t count, loff_t *ppos)
1256{ 1256{
1257 struct cache_detail *cd = PDE(file->f_dentry->d_inode)->data; 1257 struct cache_detail *cd = PDE(file->f_path.dentry->d_inode)->data;
1258 char tbuf[20]; 1258 char tbuf[20];
1259 unsigned long p = *ppos; 1259 unsigned long p = *ppos;
1260 int len; 1260 int len;
@@ -1275,7 +1275,7 @@ static ssize_t read_flush(struct file *file, char __user *buf,
1275static ssize_t write_flush(struct file * file, const char __user * buf, 1275static ssize_t write_flush(struct file * file, const char __user * buf,
1276 size_t count, loff_t *ppos) 1276 size_t count, loff_t *ppos)
1277{ 1277{
1278 struct cache_detail *cd = PDE(file->f_dentry->d_inode)->data; 1278 struct cache_detail *cd = PDE(file->f_path.dentry->d_inode)->data;
1279 char tbuf[20]; 1279 char tbuf[20];
1280 char *ep; 1280 char *ep;
1281 long flushtime; 1281 long flushtime;
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index 19703aa9659e..89273d35e0cc 100644
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -214,7 +214,7 @@ out:
214static ssize_t 214static ssize_t
215rpc_pipe_read(struct file *filp, char __user *buf, size_t len, loff_t *offset) 215rpc_pipe_read(struct file *filp, char __user *buf, size_t len, loff_t *offset)
216{ 216{
217 struct inode *inode = filp->f_dentry->d_inode; 217 struct inode *inode = filp->f_path.dentry->d_inode;
218 struct rpc_inode *rpci = RPC_I(inode); 218 struct rpc_inode *rpci = RPC_I(inode);
219 struct rpc_pipe_msg *msg; 219 struct rpc_pipe_msg *msg;
220 int res = 0; 220 int res = 0;
@@ -257,7 +257,7 @@ out_unlock:
257static ssize_t 257static ssize_t
258rpc_pipe_write(struct file *filp, const char __user *buf, size_t len, loff_t *offset) 258rpc_pipe_write(struct file *filp, const char __user *buf, size_t len, loff_t *offset)
259{ 259{
260 struct inode *inode = filp->f_dentry->d_inode; 260 struct inode *inode = filp->f_path.dentry->d_inode;
261 struct rpc_inode *rpci = RPC_I(inode); 261 struct rpc_inode *rpci = RPC_I(inode);
262 int res; 262 int res;
263 263
@@ -275,7 +275,7 @@ rpc_pipe_poll(struct file *filp, struct poll_table_struct *wait)
275 struct rpc_inode *rpci; 275 struct rpc_inode *rpci;
276 unsigned int mask = 0; 276 unsigned int mask = 0;
277 277
278 rpci = RPC_I(filp->f_dentry->d_inode); 278 rpci = RPC_I(filp->f_path.dentry->d_inode);
279 poll_wait(filp, &rpci->waitq, wait); 279 poll_wait(filp, &rpci->waitq, wait);
280 280
281 mask = POLLOUT | POLLWRNORM; 281 mask = POLLOUT | POLLWRNORM;
@@ -290,7 +290,7 @@ static int
290rpc_pipe_ioctl(struct inode *ino, struct file *filp, 290rpc_pipe_ioctl(struct inode *ino, struct file *filp,
291 unsigned int cmd, unsigned long arg) 291 unsigned int cmd, unsigned long arg)
292{ 292{
293 struct rpc_inode *rpci = RPC_I(filp->f_dentry->d_inode); 293 struct rpc_inode *rpci = RPC_I(filp->f_path.dentry->d_inode);
294 int len; 294 int len;
295 295
296 switch (cmd) { 296 switch (cmd) {