Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1209828

[PATCH] xen/tmem: Pass page instead of pfn to xen_tmem_get_page()

Show all headers | View raw

The commit 091208a676dfdabb2b8fe86ee155c6fc80081b69 "xen/tmem: Use
xen_page_to_gfn rather than pfn_to_gfn" left behind a call to
xen_tmem_get_page() receiving pfn instead of page.

This change also fixes the following build warning:

drivers/xen/tmem.c: In function ‘tmem_cleancache_get_page’:
drivers/xen/tmem.c:194:47: warning: passing argument 4 of ‘xen_tmem_get_page’ makes pointer from integer without a cast
  ret = xen_tmem_get_page((u32)pool, oid, ind, pfn);
                                               ^
drivers/xen/tmem.c:138:12: note: expected ‘struct page *’ but argument is of type ‘long unsigned int’
 static int xen_tmem_get_page(u32 pool_id, struct tmem_oid oid,
            ^

Signed-off-by: Murilo Opsfelder Araujo <mopsfelder@gmail.com>
---
 drivers/xen/tmem.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/xen/tmem.c b/drivers/xen/tmem.c
index b0c895e..945fc43 100644
--- a/drivers/xen/tmem.c
+++ b/drivers/xen/tmem.c
@@ -183,7 +183,6 @@ static int tmem_cleancache_get_page(int pool, struct cleancache_filekey key,
 {
 	u32 ind = (u32) index;
 	struct tmem_oid oid = *(struct tmem_oid *)&key;
-	unsigned long pfn = page_to_pfn(page);
 	int ret;
 
 	/* translate return values to linux semantics */
@@ -191,7 +190,7 @@ static int tmem_cleancache_get_page(int pool, struct cleancache_filekey key,
 		return -1;
 	if (ind != index)
 		return -1;
-	ret = xen_tmem_get_page((u32)pool, oid, ind, pfn);
+	ret = xen_tmem_get_page((u32)pool, oid, ind, page);
 	if (ret == 1)
 		return 0;
 	else
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] xen/tmem: Pass page instead of pfn to xen_tmem_get_page() Murilo Opsfelder Araujo <mopsfelder@gmail.com> - 2015-08-19 15:30 +0200
  Re: [PATCH] xen/tmem: Pass page instead of pfn to xen_tmem_get_page() Julien Grall <julien.grall@citrix.com> - 2015-08-20 02:30 +0200
    Re: [PATCH] xen/tmem: Pass page instead of pfn to xen_tmem_get_page() Murilo Opsfelder Araújo <mopsfelder@gmail.com> - 2015-08-22 17:00 +0200
  Re: [PATCH] xen/tmem: Pass page instead of pfn to xen_tmem_get_page() David Vrabel <david.vrabel@citrix.com> - 2015-08-20 13:30 +0200
    Re: [PATCH] xen/tmem: Pass page instead of pfn to xen_tmem_get_page() Murilo Opsfelder Araújo <mopsfelder@gmail.com> - 2015-08-22 17:00 +0200

csiph-web