From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from zeniv.linux.org.uk ([195.92.253.2]:38138 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754447AbeGIEyV (ORCPT ); Mon, 9 Jul 2018 00:54:21 -0400 From: Al Viro To: Linus Torvalds Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RFC][PATCH 24/27] new helper: alloc_file_clone() Date: Mon, 9 Jul 2018 05:54:14 +0100 Message-Id: <20180709045417.13988-24-viro@ZenIV.linux.org.uk> In-Reply-To: <20180709045417.13988-1-viro@ZenIV.linux.org.uk> References: <20180709045320.GF30522@ZenIV.linux.org.uk> <20180709045417.13988-1-viro@ZenIV.linux.org.uk> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: From: Al Viro alloc_file_clone(old_file, mode, ops): create a new struct file with ->f_path equal to that of old_file. pipe converted. Signed-off-by: Al Viro --- fs/file_table.c | 11 +++++++++++ fs/pipe.c | 5 +---- include/linux/file.h | 2 ++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/fs/file_table.c b/fs/file_table.c index d78bc97f926f..fb7c3b007630 100644 --- a/fs/file_table.c +++ b/fs/file_table.c @@ -209,6 +209,17 @@ struct file *alloc_file_pseudo(struct inode *inode, struct vfsmount *mnt, } EXPORT_SYMBOL(alloc_file_pseudo); +struct file *alloc_file_clone(struct file *base, fmode_t mode, + const struct file_operations *fops) +{ + struct file *f = alloc_file(&base->f_path, mode | FMODE_OPENED, fops); + if (!IS_ERR(f)) { + path_get(&f->f_path); + f->f_mapping = base->f_mapping; + } + return f; +} + /* the real guts of fput() - releasing the last reference to file */ static void __fput(struct file *file) diff --git a/fs/pipe.c b/fs/pipe.c index 312af057f03a..94323a1d7c92 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -760,15 +760,12 @@ int create_pipe_files(struct file **res, int flags) f->f_flags = O_WRONLY | (flags & (O_NONBLOCK | O_DIRECT)); f->private_data = inode->i_pipe; - res[0] = alloc_file(&f->f_path, FMODE_READ | FMODE_OPENED, - &pipefifo_fops); + res[0] = alloc_file_clone(f, FMODE_READ, &pipefifo_fops); if (IS_ERR(res[0])) { put_pipe_info(inode, inode->i_pipe); fput(f); return PTR_ERR(res[0]); } - - path_get(&f->f_path); res[0]->private_data = inode->i_pipe; res[0]->f_flags = O_RDONLY | (flags & O_NONBLOCK); res[1] = f; diff --git a/include/linux/file.h b/include/linux/file.h index 37a4d2c166de..c2e38ec2ee7f 100644 --- a/include/linux/file.h +++ b/include/linux/file.h @@ -23,6 +23,8 @@ extern struct file *alloc_file(const struct path *, fmode_t mode, const struct file_operations *fop); extern struct file *alloc_file_pseudo(struct inode *, struct vfsmount *, const char *, fmode_t, const struct file_operations *); +extern struct file *alloc_file_clone(struct file *, fmode_t, + const struct file_operations *); static inline void fput_light(struct file *file, int fput_needed) { -- 2.11.0