[RFC PATCH 2/6] pipes: use alloc-file instead of duplicating code

[Eric Paris]

The pipe code duplicates the functionality of alloc-file and init-file.  Use
the generic vfs functions instead of duplicating code.

Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
---

 fs/pipe.c |   21 +++++++++------------
 1 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/fs/pipe.c b/fs/pipe.c
index ae17d02..5d6c969 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -1028,20 +1028,17 @@ void free_write_pipe(struct file *f)
 
 struct file *create_read_pipe(struct file *wrf, int flags)
 {
-	struct file *f = get_empty_filp();
-	if (!f)
-		return ERR_PTR(-ENFILE);
-
-	/* Grab pipe from the writer */
-	f->f_path = wrf->f_path;
-	path_get(&wrf->f_path);
-	f->f_mapping = wrf->f_path.dentry->d_inode->i_mapping;
+	struct file *f;
+	struct dentry *dentry = wrf->f_path.dentry;
+	struct vfsmount *mnt = wrf->f_path.mnt;
 
-	f->f_pos = 0;
+	dentry = dget(dentry);
+	f = alloc_file(mnt, dentry, FMODE_READ, &read_pipefifo_fops);
+	if (!f) {
+		dput(dentry);
+		return ERR_PTR(-ENFILE);
+	}
 	f->f_flags = O_RDONLY | (flags & O_NONBLOCK);
-	f->f_op = &read_pipefifo_fops;
-	f->f_mode = FMODE_READ;
-	f->f_version = 0;
 
 	return f;
 }

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/