From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77E2EC5CFE7 for ; Wed, 11 Jul 2018 02:22:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 33C47208FA for ; Wed, 11 Jul 2018 02:22:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 33C47208FA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ZenIV.linux.org.uk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732669AbeGKCYJ (ORCPT ); Tue, 10 Jul 2018 22:24:09 -0400 Received: from zeniv.linux.org.uk ([195.92.253.2]:45706 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732567AbeGKCYI (ORCPT ); Tue, 10 Jul 2018 22:24:08 -0400 Received: from viro by ZenIV.linux.org.uk with local (Exim 4.87 #1 (Red Hat Linux)) id 1fd4le-0003LV-QG; Wed, 11 Jul 2018 02:22:10 +0000 From: Al Viro To: Linus Torvalds Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Miklos Szeredi Subject: [RFC][PATCH 36/42] new helper: alloc_file_clone() Date: Wed, 11 Jul 2018 03:22:00 +0100 Message-Id: <20180711022206.12571-36-viro@ZenIV.linux.org.uk> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20180711022206.12571-1-viro@ZenIV.linux.org.uk> References: <20180711021136.GN30522@ZenIV.linux.org.uk> <20180711022206.12571-1-viro@ZenIV.linux.org.uk> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 | 4 +--- include/linux/file.h | 2 ++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/fs/file_table.c b/fs/file_table.c index 23bc46ea5f4b..9097a6fb5a2f 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, 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 c8c4265bf87b..94323a1d7c92 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -760,14 +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, &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 0a4ef2315f75..22becbfd4cec 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