NFS: Fix I/O request leakages (f57dcf4c) · Commits · 戴 / test

fs/nfs/pagelist.c

+21 −5

Original line number	Diff line number	Diff line
		@@ -988,6 +988,17 @@ static void nfs_pageio_doio(struct nfs_pageio_descriptor *desc)
		}
		}

		static void
		nfs_pageio_cleanup_request(struct nfs_pageio_descriptor *desc,
		struct nfs_page *req)
		{
		LIST_HEAD(head);

		nfs_list_remove_request(req);
		nfs_list_add_request(req, &head);
		desc->pg_completion_ops->error_cleanup(&head);
		}

		/**
		* nfs_pageio_add_request - Attempt to coalesce a request into a page list.
		* @desc: destination io descriptor
		@@ -1025,10 +1036,8 @@ static int __nfs_pageio_add_request(struct nfs_pageio_descriptor *desc,
		nfs_page_group_unlock(req);
		desc->pg_moreio = 1;
		nfs_pageio_doio(desc);
		if (desc->pg_error < 0)
		return 0;
		if (mirror->pg_recoalesce)
		return 0;
		if (desc->pg_error < 0 \|\| mirror->pg_recoalesce)
		goto out_cleanup_subreq;
		/* retry add_request for this subreq */
		nfs_page_group_lock(req);
		continue;
		@@ -1061,6 +1070,10 @@ err_ptr:
		desc->pg_error = PTR_ERR(subreq);
		nfs_page_group_unlock(req);
		return 0;
		out_cleanup_subreq:
		if (req != subreq)
		nfs_pageio_cleanup_request(desc, subreq);
		return 0;
		}

		static int nfs_do_recoalesce(struct nfs_pageio_descriptor *desc)
		@@ -1168,11 +1181,14 @@ int nfs_pageio_add_request(struct nfs_pageio_descriptor *desc,
		if (nfs_pgio_has_mirroring(desc))
		desc->pg_mirror_idx = midx;
		if (!nfs_pageio_add_request_mirror(desc, dupreq))
		goto out_failed;
		goto out_cleanup_subreq;
		}

		return 1;

		out_cleanup_subreq:
		if (req != dupreq)
		nfs_pageio_cleanup_request(desc, dupreq);
		out_failed:
		nfs_pageio_error_cleanup(desc);
		return 0;