aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Drokin <green@linuxhacker.ru>2016-01-03 12:05:41 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-03 14:27:25 -0800
commit4eb53dfd23281c6e358f26af56b3572bdcbfd43a (patch)
tree048a797ab982e9646c8c18a2921a38be4ff356a3
parentstaging/lustre: Mark obd_ioctl_popdata/getdata argument as __user (diff)
staging/lustre/lnet: Properly mark userspace pointer of lnet_ping()
This also happens to silence sparce warnings about different address spaces. Signed-off-by: Oleg Drokin <green@linuxhacker.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/lustre/lnet/lnet/api-ni.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/lustre/lnet/lnet/api-ni.c b/drivers/staging/lustre/lnet/lnet/api-ni.c
index 80b170ee5582..d33fbdf99505 100644
--- a/drivers/staging/lustre/lnet/lnet/api-ni.c
+++ b/drivers/staging/lustre/lnet/lnet/api-ni.c
@@ -62,7 +62,7 @@ module_param(rnet_htable_size, int, 0444);
MODULE_PARM_DESC(rnet_htable_size, "size of remote network hash table");
static int lnet_ping(lnet_process_id_t id, int timeout_ms,
- lnet_process_id_t *ids, int n_ids);
+ lnet_process_id_t __user *ids, int n_ids);
static char *
lnet_get_routes(void)
@@ -1376,7 +1376,7 @@ LNetCtl(unsigned int cmd, void *arg)
id.nid = data->ioc_nid;
id.pid = data->ioc_u32[0];
rc = lnet_ping(id, data->ioc_u32[1], /* timeout */
- (lnet_process_id_t *)data->ioc_pbuf1,
+ data->ioc_pbuf1,
data->ioc_plen1/sizeof(lnet_process_id_t));
if (rc < 0)
return rc;
@@ -1646,7 +1646,7 @@ lnet_ping_target_fini(void)
}
static int lnet_ping(lnet_process_id_t id, int timeout_ms,
- lnet_process_id_t *ids, int n_ids)
+ lnet_process_id_t __user *ids, int n_ids)
{
lnet_handle_eq_t eqh;
lnet_handle_md_t mdh;