On Mar 4, 2016, at 9:09 PM, James Simmons wrote: > From: Frank Zago <fz...@cray.com> > > One of the __user was missed in being applied to upstream > client. This is broken out of patch 11819.
It was not, the bug was fixed in another way. > Signed-off-by: Frank Zago <fz...@cray.com> > Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5396 > Reviewed-on: http://review.whamcloud.com/11819 > Reviewed-by: James Simmons <uja.o...@gmail.com> > Reviewed-by: Dmitry Eremin <dmitry.ere...@intel.com> > Reviewed-by: Oleg Drokin <oleg.dro...@intel.com> > --- > drivers/staging/lustre/lnet/lnet/api-ni.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/staging/lustre/lnet/lnet/api-ni.c > b/drivers/staging/lustre/lnet/lnet/api-ni.c > index a666d49..7395985 100644 > --- a/drivers/staging/lustre/lnet/lnet/api-ni.c > +++ b/drivers/staging/lustre/lnet/lnet/api-ni.c > @@ -2041,7 +2041,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 */ > - data->ioc_pbuf1, > + (lnet_process_id_t __user *)data->ioc_pbuf1, We do not need this one anymore, since ioc_pbuf1 is defned as user now: drivers/staging/lustre/include/linux/libcfs/libcfs_ioctl.h: void __user *ioc_pbuf1; > data->ioc_plen1 / sizeof(lnet_process_id_t)); > if (rc < 0) > return rc; > -- > 1.7.1 >
