NFS: Don't loop forever in nfs_do_recoalesce()
authorTrond Myklebust <trond.myklebust@hammerspace.com>
Sat, 26 Mar 2022 01:51:03 +0000 (21:51 -0400)
committerTrond Myklebust <trond.myklebust@hammerspace.com>
Sat, 26 Mar 2022 01:51:03 +0000 (21:51 -0400)
If __nfs_pageio_add_request() fails to add the request, it will return
with either desc->pg_error < 0, or mirror->pg_recoalesce will be set, so
we are guaranteed either to exit the function altogether, or to loop.

However if there is nothing left in mirror->pg_list to coalesce, we must
exit, so make sure that we clear mirror->pg_recoalesce every time we
loop.

Reported-by: Olga Kornievskaia <aglo@umich.edu>
Fixes: 70536bf4eb07 ("NFS: Clean up reset of the mirror accounting variables")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
fs/nfs/pagelist.c

index 3156db526cc45dad5d0ed5615b6b05270ef9b2b4..9157dd19b8b4f3ef4387827376a603c5ce22d48e 100644 (file)
@@ -1218,6 +1218,7 @@ static int nfs_do_recoalesce(struct nfs_pageio_descriptor *desc)
 
        do {
                list_splice_init(&mirror->pg_list, &head);
+               mirror->pg_recoalesce = 0;
 
                while (!list_empty(&head)) {
                        struct nfs_page *req;