staging: kpc2000: Convert put_page() to put_user_page*() (8e7cb735) · Commits · 戴 / test

For pages that were retained via get_user_pages*(), release those pages via the new put_user_page*() routines, instead of via put_page(). This is part a tree-wide conversion, as described in commit ("mm: introduce put_user_page*(), placeholder versions"). Cc: Ira Weiny <ira.weiny@intel.com> Cc: John Hubbard <jhubbard@nvidia.com> Cc: Jérôme Glisse <jglisse@redhat.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Matt Sickler <Matt.Sickler@daktronics.com> Cc: devel@driverdev.osuosl.org Cc: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org Reviewed-by:

John Hubbard <jhubbard@nvidia.com> Signed-off-by:

Bharath Vedartham <linux.bhar@gmail.com> Link: https://lore.kernel.org/r/1564058658-3551-1-git-send-email-linux.bhar@gmail.com Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/staging/kpc2000/kpc_dma/fileops.c

+6 −11

Original line number	Diff line number	Diff line
		@@ -190,9 +190,7 @@ static int kpc_dma_transfer(struct dev_private_data *priv,
		sg_free_table(&acd->sgt);
		err_dma_map_sg:
		err_alloc_sg_table:
		for (i = 0 ; i < acd->page_count ; i++) {
		put_page(acd->user_pages[i]);
		}
		put_user_pages(acd->user_pages, acd->page_count);
		err_get_user_pages:
		kfree(acd->user_pages);
		err_alloc_userpages:
		@@ -211,16 +209,13 @@ void transfer_complete_cb(struct aio_cb_data *acd, size_t xfr_count, u32 flags)
		BUG_ON(acd->ldev == NULL);
		BUG_ON(acd->ldev->pldev == NULL);

		for (i = 0 ; i < acd->page_count ; i++) {
		if (!PageReserved(acd->user_pages[i])) {
		set_page_dirty(acd->user_pages[i]);
		}
		}

		dma_unmap_sg(&acd->ldev->pldev->dev, acd->sgt.sgl, acd->sgt.nents, acd->ldev->dir);

		for (i = 0; i < acd->page_count; i++) {
		put_page(acd->user_pages[i]);
		if (!PageReserved(acd->user_pages[i]))
		put_user_pages_dirty(&acd->user_pages[i], 1);
		else
		put_user_page(acd->user_pages[i]);
		}

		sg_free_table(&acd->sgt);

Admin message