From: Christoph Hellwig <hch@lst.de>
To: viro@zeniv.linux.org.uk
Cc: sfr@canb.auug.org.au, linux-fsdevel@vger.kernel.org
Subject: [PATCH] init: fix init_dup
Date: Mon, 3 Aug 2020 15:58:19 +0200 [thread overview]
Message-ID: <20200803135819.751465-1-hch@lst.de> (raw)
Don't allocate an unused fd for each call. Also drop the extra
reference from filp_open after the init_dup calls while we're at it.
Fixes: 36e96b411649 ("init: add an init_dup helper")
Reported-by Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
Al, feel free to fold this into the original patch, as that is the
last one in the branch.
fs/init.c | 2 +-
init/main.c | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/fs/init.c b/fs/init.c
index 730e05acda2392..e9c320a48cf157 100644
--- a/fs/init.c
+++ b/fs/init.c
@@ -260,6 +260,6 @@ int __init init_dup(struct file *file)
fd = get_unused_fd_flags(0);
if (fd < 0)
return fd;
- fd_install(get_unused_fd_flags(0), get_file(file));
+ fd_install(fd, get_file(file));
return 0;
}
diff --git a/init/main.c b/init/main.c
index 089e21504b1fc1..9dae9c4f806bb9 100644
--- a/init/main.c
+++ b/init/main.c
@@ -1470,6 +1470,7 @@ void __init console_on_rootfs(void)
init_dup(file);
init_dup(file);
init_dup(file);
+ fput(file);
}
static noinline void __init kernel_init_freeable(void)
--
2.27.0
next reply other threads:[~2020-08-03 13:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-03 13:58 Christoph Hellwig [this message]
2020-08-03 23:53 ` [PATCH] init: fix init_dup Stephen Rothwell
2020-08-04 8:39 ` Stephen Rothwell
2020-08-04 1:21 ` Al Viro
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200803135819.751465-1-hch@lst.de \
--to=hch@lst.de \
--cc=linux-fsdevel@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).