Received-SPF: pass (google.com: domain of linux-nfs+bounces-2215-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Precedence: bulk
MIME-Version: 1.0
References: <810bc21335858754c1a3fbee0a3c94de001f4c3f.1709659767.git.bcodding@redhat.com>
In-Reply-To: <810bc21335858754c1a3fbee0a3c94de001f4c3f.1709659767.git.bcodding@redhat.com>
From: David Wysochanski <dwysocha@redhat.com>
Date: Tue, 5 Mar 2024 13:00:37 -0500
Message-ID: <CALF+zOn50xfKDBxqG1JfWVcRa+PvMvMpcWYfJmt0FWoUe0mW5w@mail.gmail.com>
Subject: Re: [PATCH] NFS: Read unlock folio on nfs_page_create_from_folio() error
To: Benjamin Coddington <bcodding@redhat.com>
Cc: Trond Myklebust <trond.myklebust@primarydata.com>, 
	Anna Schumaker <anna.schumaker@netapp.com>, linux-nfs@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Tue, Mar 5, 2024 at 12:30=E2=80=AFPM Benjamin Coddington <bcodding@redha=
t.com> wrote:
>
> The netfs conversion lost a folio_unlock() for the case where
> nfs_page_create_from_folio() returns an error (usually -ENOMEM).  Restore
> it.
>
> Reported-by: David Jeffery <djeffery@redhat.com>
> Cc: <stable@vger.kernel.org> # 6.4+
> Fixes: 000dbe0bec05 ("NFS: Convert buffered read paths to use netfs when =
fscache is enabled")
> Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
> ---
>  fs/nfs/read.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/fs/nfs/read.c b/fs/nfs/read.c
> index 7dc21a48e3e7..a142287d86f6 100644
> --- a/fs/nfs/read.c
> +++ b/fs/nfs/read.c
> @@ -305,6 +305,8 @@ int nfs_read_add_folio(struct nfs_pageio_descriptor *=
pgio,
>         new =3D nfs_page_create_from_folio(ctx, folio, 0, aligned_len);
>         if (IS_ERR(new)) {
>                 error =3D PTR_ERR(new);
> +               if (nfs_netfs_folio_unlock(folio))
> +                       folio_unlock(folio);
>                 goto out;
>         }
>
> --
> 2.43.0
>


Acked-by: Dave Wysochanski <dwysocha@redhat.com>