ceph: new mount option to disable usage of copy-from op

[sfrench/cifs-2.6.git] / fs / pipe.c

diff --git a/fs/pipe.c b/fs/pipe.c
index 39d6f431da83f4227fbfbee1b6931230aa82e95c..bdc5d3c0977d09b37d5eb80abfb92c3a336f6c92 100644 (file)
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -741,54 +741,33 @@ fail_inode:
 
 int create_pipe_files(struct file **res, int flags)
 {
-       int err;
        struct inode *inode = get_pipe_inode();
        struct file *f;
-       struct path path;
 
        if (!inode)
                return -ENFILE;
 
-       err = -ENOMEM;
-       path.dentry = d_alloc_pseudo(pipe_mnt->mnt_sb, &empty_name);
-       if (!path.dentry)
-               goto err_inode;
-       path.mnt = mntget(pipe_mnt);
-
-       d_instantiate(path.dentry, inode);
-
-       f = alloc_file(&path, FMODE_WRITE, &pipefifo_fops);
+       f = alloc_file_pseudo(inode, pipe_mnt, "",
+                               O_WRONLY | (flags & (O_NONBLOCK | O_DIRECT)),
+                               &pipefifo_fops);
        if (IS_ERR(f)) {
-               err = PTR_ERR(f);
-               goto err_dentry;
+               free_pipe_info(inode->i_pipe);
+               iput(inode);
+               return PTR_ERR(f);
        }
 
-       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);
+       res[0] = alloc_file_clone(f, O_RDONLY | (flags & O_NONBLOCK),
+                                 &pipefifo_fops);
        if (IS_ERR(res[0])) {
-               err = PTR_ERR(res[0]);
-               goto err_file;
+               put_pipe_info(inode, inode->i_pipe);
+               fput(f);
+               return PTR_ERR(res[0]);
        }
-
-       path_get(&path);
        res[0]->private_data = inode->i_pipe;
-       res[0]->f_flags = O_RDONLY | (flags & O_NONBLOCK);
        res[1] = f;
        return 0;
-
-err_file:
-       put_filp(f);
-err_dentry:
-       free_pipe_info(inode->i_pipe);
-       path_put(&path);
-       return err;
-
-err_inode:
-       free_pipe_info(inode->i_pipe);
-       iput(inode);
-       return err;
 }
 
 static int __do_pipe_flags(int *fd, struct file **files, int flags)