queue-5.15/nfsd-don-t-take-put-an-extra-reference-when-putting-.patch

   1 From f9b0514f4565643d402332d55c94dbc4e9829d0a Mon Sep 17 00:00:00 2001
   2 From: Sasha Levin <sashal@kernel.org>
   3 Date: Wed, 18 Jan 2023 12:31:37 -0500
   4 Subject: nfsd: don't take/put an extra reference when putting a file
   5
   6 From: Jeff Layton <jlayton@kernel.org>
   7
   8 [ Upstream commit b2ff1bd71db2a1b193a6dde0845adcd69cbcf75e ]
   9
  10 The last thing that filp_close does is an fput, so don't bother taking
  11 and putting the extra reference.
  12
  13 Signed-off-by: Jeff Layton <jlayton@kernel.org>
  14 Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
  15 ---
  16  fs/nfsd/filecache.c | 4 +---
  17  1 file changed, 1 insertion(+), 3 deletions(-)
  18
  19 diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c
  20 index faa0c7d0253eb..786e06cf107ff 100644
  21 --- a/fs/nfsd/filecache.c
  22 +++ b/fs/nfsd/filecache.c
  23 @@ -381,10 +381,8 @@ nfsd_file_free(struct nfsd_file *nf)
  24         if (nf->nf_mark)
  25                 nfsd_file_mark_put(nf->nf_mark);
  26         if (nf->nf_file) {
  27 -               get_file(nf->nf_file);
  28 -               filp_close(nf->nf_file, NULL);
  29                 nfsd_file_check_write_error(nf);
  30 -               fput(nf->nf_file);
  31 +               filp_close(nf->nf_file, NULL);
  32         }
  33
  34         /*
  35 --
  36 2.43.0
  37