nfs: Fix a missed page unlock after pg_doio() (fdbd1a2e) · Commits · 戴 / test

fs/nfs/pagelist.c

+21 −19

Original line number	Diff line number	Diff line
		@@ -1110,6 +1110,20 @@ static int nfs_pageio_add_request_mirror(struct nfs_pageio_descriptor *desc,
		return ret;
		}

		static void nfs_pageio_error_cleanup(struct nfs_pageio_descriptor *desc)
		{
		u32 midx;
		struct nfs_pgio_mirror *mirror;

		if (!desc->pg_error)
		return;

		for (midx = 0; midx < desc->pg_mirror_count; midx++) {
		mirror = &desc->pg_mirrors[midx];
		desc->pg_completion_ops->error_cleanup(&mirror->pg_list);
		}
		}

		int nfs_pageio_add_request(struct nfs_pageio_descriptor *desc,
		struct nfs_page *req)
		{
		@@ -1160,25 +1174,11 @@ int nfs_pageio_add_request(struct nfs_pageio_descriptor *desc,
		return 1;

		out_failed:
		/*
		* We might have failed before sending any reqs over wire.
		* Clean up rest of the reqs in mirror pg_list.
		*/
		if (desc->pg_error) {
		struct nfs_pgio_mirror *mirror;
		void (func)(struct list_head );

		/* remember fatal errors */
		if (nfs_error_is_fatal(desc->pg_error))
		nfs_context_set_write_error(req->wb_context,
		desc->pg_error);

		func = desc->pg_completion_ops->error_cleanup;
		for (midx = 0; midx < desc->pg_mirror_count; midx++) {
		mirror = &desc->pg_mirrors[midx];
		func(&mirror->pg_list);
		}
		}
		nfs_pageio_error_cleanup(desc);
		return 0;
		}

		@@ -1250,6 +1250,8 @@ void nfs_pageio_complete(struct nfs_pageio_descriptor *desc)
		for (midx = 0; midx < desc->pg_mirror_count; midx++)
		nfs_pageio_complete_mirror(desc, midx);

		if (desc->pg_error < 0)
		nfs_pageio_error_cleanup(desc);
		if (desc->pg_ops->pg_cleanup)
		desc->pg_ops->pg_cleanup(desc);
		nfs_pageio_cleanup_mirroring(desc);