Commit 303b46bb authored by Josef Sipek's avatar Josef Sipek Committed by Linus Torvalds
Browse files

[PATCH] struct path: convert sunrpc 



Signed-off-by: default avatarJosef Sipek <jsipek@fsl.cs.sunysb.edu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1250ca4c

net/sunrpc/auth_gss/auth_gss.c

+1 −1
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ gss_pipe_downcall(struct file *filp, const char __user *src, size_t mlen) 
	if (!buf)

		goto out;



	clnt = RPC_I(filp->f_dentry->d_inode)->private;

	clnt = RPC_I(filp->f_path.dentry->d_inode)->private;

	err = -EFAULT;

	if (copy_from_user(buf, src, mlen))

		goto err;

net/sunrpc/cache.c

+5 −5
Original line number Diff line number Diff line
@@ -670,7 +670,7 @@ cache_read(struct file *filp, char __user *buf, size_t count, loff_t *ppos) 
{

	struct cache_reader *rp = filp->private_data;

	struct cache_request *rq;

	struct cache_detail *cd = PDE(filp->f_dentry->d_inode)->data;

	struct cache_detail *cd = PDE(filp->f_path.dentry->d_inode)->data;

	int err;



	if (count == 0)
@@ -747,7 +747,7 @@ cache_write(struct file *filp, const char __user *buf, size_t count, 
	    loff_t *ppos)

{

	int err;

	struct cache_detail *cd = PDE(filp->f_dentry->d_inode)->data;

	struct cache_detail *cd = PDE(filp->f_path.dentry->d_inode)->data;



	if (count == 0)

		return 0;
@@ -778,7 +778,7 @@ cache_poll(struct file *filp, poll_table *wait) 
	unsigned int mask;

	struct cache_reader *rp = filp->private_data;

	struct cache_queue *cq;

	struct cache_detail *cd = PDE(filp->f_dentry->d_inode)->data;

	struct cache_detail *cd = PDE(filp->f_path.dentry->d_inode)->data;



	poll_wait(filp, &queue_wait, wait);
@@ -1254,7 +1254,7 @@ static struct file_operations content_file_operations = { 
static ssize_t read_flush(struct file *file, char __user *buf,

			    size_t count, loff_t *ppos)

{

	struct cache_detail *cd = PDE(file->f_dentry->d_inode)->data;

	struct cache_detail *cd = PDE(file->f_path.dentry->d_inode)->data;

	char tbuf[20];

	unsigned long p = *ppos;

	int len;
@@ -1275,7 +1275,7 @@ static ssize_t read_flush(struct file *file, char __user *buf, 
static ssize_t write_flush(struct file * file, const char __user * buf,

			     size_t count, loff_t *ppos)

{

	struct cache_detail *cd = PDE(file->f_dentry->d_inode)->data;

	struct cache_detail *cd = PDE(file->f_path.dentry->d_inode)->data;

	char tbuf[20];

	char *ep;

	long flushtime;

net/sunrpc/rpc_pipe.c

+4 −4
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ rpc_pipe_release(struct inode *inode, struct file *filp) 
static ssize_t

rpc_pipe_read(struct file *filp, char __user *buf, size_t len, loff_t *offset)

{

	struct inode *inode = filp->f_dentry->d_inode;

	struct inode *inode = filp->f_path.dentry->d_inode;

	struct rpc_inode *rpci = RPC_I(inode);

	struct rpc_pipe_msg *msg;

	int res = 0;
@@ -257,7 +257,7 @@ rpc_pipe_read(struct file *filp, char __user *buf, size_t len, loff_t *offset) 
static ssize_t

rpc_pipe_write(struct file *filp, const char __user *buf, size_t len, loff_t *offset)

{

	struct inode *inode = filp->f_dentry->d_inode;

	struct inode *inode = filp->f_path.dentry->d_inode;

	struct rpc_inode *rpci = RPC_I(inode);

	int res;
@@ -275,7 +275,7 @@ rpc_pipe_poll(struct file *filp, struct poll_table_struct *wait) 
	struct rpc_inode *rpci;

	unsigned int mask = 0;



	rpci = RPC_I(filp->f_dentry->d_inode);

	rpci = RPC_I(filp->f_path.dentry->d_inode);

	poll_wait(filp, &rpci->waitq, wait);



	mask = POLLOUT | POLLWRNORM;
@@ -290,7 +290,7 @@ static int 
rpc_pipe_ioctl(struct inode *ino, struct file *filp,

		unsigned int cmd, unsigned long arg)

{

	struct rpc_inode *rpci = RPC_I(filp->f_dentry->d_inode);

	struct rpc_inode *rpci = RPC_I(filp->f_path.dentry->d_inode);

	int len;



	switch (cmd) {