]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
nfsd: don't take/put an extra reference when putting a file
authorJeff Layton <jlayton@kernel.org>
Wed, 18 Jan 2023 17:31:37 +0000 (12:31 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 10 Apr 2024 14:19:27 +0000 (16:19 +0200)
[ Upstream commit b2ff1bd71db2a1b193a6dde0845adcd69cbcf75e ]

The last thing that filp_close does is an fput, so don't bother taking
and putting the extra reference.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
fs/nfsd/filecache.c

index faa0c7d0253ebfd5ae48a8b1b47a229f73c5dfc2..786e06cf107ffd17891d5f661498ec1071bf5cb0 100644 (file)
@@ -381,10 +381,8 @@ nfsd_file_free(struct nfsd_file *nf)
        if (nf->nf_mark)
                nfsd_file_mark_put(nf->nf_mark);
        if (nf->nf_file) {
-               get_file(nf->nf_file);
-               filp_close(nf->nf_file, NULL);
                nfsd_file_check_write_error(nf);
-               fput(nf->nf_file);
+               filp_close(nf->nf_file, NULL);
        }
 
        /*