From 4594c003e9aa63bde006908e34834a8c134b305c Mon Sep 17 00:00:00 2001 From: Oleg Drokin Date: Sun, 3 Jan 2016 16:37:12 -0500 Subject: [PATCH] LU-7623 lnet: Remove __user attribute from lnet_copy_flat2* functions These functions do not take a user pointer, so __user attribute was a mistake This was introduced by http://review.whamcloud.com/11819, commit 4ea13c63f3d919282b12c64d0c014bfe9a67a5e6 Change-Id: I97c1a9b17e3146f9f5f37ac92f7769cfdcf085cb Signed-off-by: Oleg Drokin Reviewed-on: http://review.whamcloud.com/17785 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: John L. Hammond Reviewed-by: Frank Zago --- lnet/include/lnet/lib-lnet.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lnet/include/lnet/lib-lnet.h b/lnet/include/lnet/lib-lnet.h index d23e4b1..3a74c4f 100644 --- a/lnet/include/lnet/lib-lnet.h +++ b/lnet/include/lnet/lib-lnet.h @@ -664,7 +664,7 @@ void lnet_copy_kiov2kiov(unsigned int ndkiov, lnet_kiov_t *dkiov, unsigned int soffset, unsigned int nob); static inline void -lnet_copy_iov2flat(int dlen, __user void *dest, unsigned int doffset, +lnet_copy_iov2flat(int dlen, void *dest, unsigned int doffset, unsigned int nsiov, struct kvec *siov, unsigned int soffset, unsigned int nob) { @@ -675,7 +675,7 @@ lnet_copy_iov2flat(int dlen, __user void *dest, unsigned int doffset, } static inline void -lnet_copy_kiov2flat(int dlen, void __user *dest, unsigned int doffset, +lnet_copy_kiov2flat(int dlen, void *dest, unsigned int doffset, unsigned int nsiov, lnet_kiov_t *skiov, unsigned int soffset, unsigned int nob) { @@ -687,7 +687,7 @@ lnet_copy_kiov2flat(int dlen, void __user *dest, unsigned int doffset, static inline void lnet_copy_flat2iov(unsigned int ndiov, struct kvec *diov, unsigned int doffset, - int slen, void __user *src, unsigned int soffset, + int slen, void *src, unsigned int soffset, unsigned int nob) { struct kvec siov = {/*.iov_base = */ src, /*.iov_len = */slen}; @@ -697,7 +697,7 @@ lnet_copy_flat2iov(unsigned int ndiov, struct kvec *diov, unsigned int doffset, static inline void lnet_copy_flat2kiov(unsigned int ndiov, lnet_kiov_t *dkiov, - unsigned int doffset, int slen, void __user *src, + unsigned int doffset, int slen, void *src, unsigned int soffset, unsigned int nob) { struct kvec siov = {/* .iov_base = */ src, /* .iov_len = */ slen}; -- 1.8.3.1