Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Fri, 24 Mar 2023 05:58:28 +0000
From:   Alok Tiagi <aloktiagi@gmail.com>
To:     Matthew Wilcox <willy@infradead.org>
Cc:     viro@zeniv.linux.org.uk, brauner@kernel.org,
        David.Laight@aculab.com, linux-fsdevel@vger.kernel.org,
        linux-kernel@vger.kernel.org, keescook@chromium.org,
        hch@infradead.org, Tycho Andersen <tycho@tycho.pizza>,
        aloktiagi@gmail.com
Subject: Re: [RFC v3 2/3] file: allow callers to free the old file descriptor
 after dup2
Message-ID: <ZB08BPmuqEsw3bqU@ip-172-31-38-16.us-west-2.compute.internal>
References: <20230324051526.963702-1-aloktiagi@gmail.com>
 <20230324051526.963702-2-aloktiagi@gmail.com>
 <ZB005rys4ZTeaQfU@casper.infradead.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <ZB005rys4ZTeaQfU@casper.infradead.org>
Precedence: bulk

On Fri, Mar 24, 2023 at 05:28:06AM +0000, Matthew Wilcox wrote:
> On Fri, Mar 24, 2023 at 05:15:25AM +0000, aloktiagi wrote:
> > @@ -1119,8 +1119,12 @@ __releases(&files->file_lock)
> >  		__clear_close_on_exec(fd, fdt);
> >  	spin_unlock(&files->file_lock);
> >  
> > -	if (tofree)
> > -		filp_close(tofree, files);
> > +	if (fdfile) {
> > +		*fdfile = tofree;
> > +	} else {
> > +		if (tofree)
> > +			filp_close(tofree, files);
> > +	}
> 
> Why not:
> 
> 	if (fdfile)
> 		 *fdfile = tofree;
> 	else if (tofree)
> 		filp_close(tofree, files);
> 
> Shorter and makes the parallel structure more obvious.
> 

Agreed. Thank you for suggesting that. I'll fix this in v4.