Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 216020
b: refs/heads/master
c: 655b5bb
h: refs/heads/master
v: v3
  • Loading branch information
Joe Perches authored and Jiri Kosina committed Sep 23, 2010
1 parent 0ad3700 commit e16d966
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ea3f0e6bc5312e5f664221c5941a76bdf49c9970
refs/heads/master: 655b5bb4a794267527a3059a22de54778a4548f3
4 changes: 2 additions & 2 deletions trunk/net/sunrpc/rpc_pipe.c
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ rpc_pipe_release(struct inode *inode, struct file *filp)
mutex_lock(&inode->i_mutex);
if (rpci->ops == NULL)
goto out;
msg = (struct rpc_pipe_msg *)filp->private_data;
msg = filp->private_data;
if (msg != NULL) {
spin_lock(&inode->i_lock);
msg->errno = -EAGAIN;
Expand Down Expand Up @@ -322,7 +322,7 @@ rpc_pipe_ioctl_unlocked(struct file *filp, unsigned int cmd, unsigned long arg)
len = rpci->pipelen;
if (filp->private_data) {
struct rpc_pipe_msg *msg;
msg = (struct rpc_pipe_msg *)filp->private_data;
msg = filp->private_data;
len += msg->len - msg->copied;
}
return put_user(len, (int __user *)arg);
Expand Down

0 comments on commit e16d966

Please sign in to comment.