init: fix init_dup
diff mbox series

Message ID 20200803135819.751465-1-hch@lst.de
State New
Headers show
Series
  • init: fix init_dup
Related show

Commit Message

Christoph Hellwig Aug. 3, 2020, 1:58 p.m. UTC
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(-)

Comments

Stephen Rothwell Aug. 3, 2020, 11:53 p.m. UTC | #1
Hi Christoph,

On Mon,  3 Aug 2020 15:58:19 +0200 Christoph Hellwig <hch@lst.de> wrote:
>
> 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
> 

Thanks, I have added that to the vfs tree merge today.
Al Viro Aug. 4, 2020, 1:21 a.m. UTC | #2
On Mon, Aug 03, 2020 at 03:58:19PM +0200, Christoph Hellwig wrote:
> 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.

Done and pushed, along with regenerated #for-next
Stephen Rothwell Aug. 4, 2020, 8:39 a.m. UTC | #3
Hi Christoph,

On Tue, 4 Aug 2020 09:53:54 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Mon,  3 Aug 2020 15:58:19 +0200 Christoph Hellwig <hch@lst.de> wrote:
> >
> > 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
> >   
> 
> Thanks, I have added that to the vfs tree merge today.

This fixes my qemu problems, thanks.

Patch
diff mbox series

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)