pipe: set file->private_data to ->i_pipe
simplify get_pipe_info(), while we are at it
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
diff --git a/fs/pipe.c b/fs/pipe.c
index d4b97e4..161b209 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -363,7 +363,7 @@
unsigned long nr_segs, loff_t pos)
{
struct file *filp = iocb->ki_filp;
- struct pipe_inode_info *pipe = file_inode(filp)->i_pipe;
+ struct pipe_inode_info *pipe = filp->private_data;
int do_wakeup;
ssize_t ret;
struct iovec *iov = (struct iovec *)_iov;
@@ -486,7 +486,7 @@
unsigned long nr_segs, loff_t ppos)
{
struct file *filp = iocb->ki_filp;
- struct pipe_inode_info *pipe = file_inode(filp)->i_pipe;
+ struct pipe_inode_info *pipe = filp->private_data;
ssize_t ret;
int do_wakeup;
struct iovec *iov = (struct iovec *)_iov;
@@ -662,7 +662,7 @@
static long pipe_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{
- struct pipe_inode_info *pipe = file_inode(filp)->i_pipe;
+ struct pipe_inode_info *pipe = filp->private_data;
int count, buf, nrbufs;
switch (cmd) {
@@ -688,7 +688,7 @@
pipe_poll(struct file *filp, poll_table *wait)
{
unsigned int mask;
- struct pipe_inode_info *pipe = file_inode(filp)->i_pipe;
+ struct pipe_inode_info *pipe = filp->private_data;
int nrbufs;
poll_wait(filp, &pipe->wait, wait);
@@ -749,7 +749,7 @@
static int
pipe_fasync(int fd, struct file *filp, int on)
{
- struct pipe_inode_info *pipe = file_inode(filp)->i_pipe;
+ struct pipe_inode_info *pipe = filp->private_data;
int retval = 0;
pipe_lock(pipe);
@@ -887,12 +887,14 @@
goto err_dentry;
f->f_flags = O_WRONLY | (flags & (O_NONBLOCK | O_DIRECT));
+ f->private_data = inode->i_pipe;
res[0] = alloc_file(&path, FMODE_READ, &pipefifo_fops);
if (IS_ERR(res[0]))
goto err_file;
path_get(&path);
+ res[0]->private_data = inode->i_pipe;
res[0]->f_flags = O_RDONLY | (flags & O_NONBLOCK);
res[1] = f;
return 0;
@@ -1035,6 +1037,7 @@
spin_unlock(&inode->i_lock);
}
}
+ filp->private_data = pipe;
/* OK, we have a pipe and it's pinned down */
pipe_lock(pipe);
@@ -1233,9 +1236,7 @@
*/
struct pipe_inode_info *get_pipe_info(struct file *file)
{
- struct inode *i = file_inode(file);
-
- return S_ISFIFO(i->i_mode) ? i->i_pipe : NULL;
+ return file->f_op == &pipefifo_fops ? file->private_data : NULL;
}
long pipe_fcntl(struct file *file, unsigned int cmd, unsigned long arg)