aboutsummaryrefslogtreecommitdiffstats
path: root/net/sunrpc/rpc_pipe.c
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/sunrpc/rpc_pipe.c
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/sunrpc/rpc_pipe.c')
-rw-r--r--net/sunrpc/rpc_pipe.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index 19703aa9659..89273d35e0c 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) {