diff options
author | Mike Marshall <hubcap@omnibond.com> | 2018-06-01 12:19:45 -0400 |
---|---|---|
committer | Mike Marshall <hubcap@omnibond.com> | 2018-06-01 14:51:36 -0400 |
commit | 817e9b4d9e660761e1e613aa294bf77d2e7c7310 (patch) | |
tree | bdd031825e002215485f9a6b63954147f1d64ef1 /fs/orangefs | |
parent | 95f5f88f8900c09eb534c8cb42d75ff3cf7ea96c (diff) | |
download | op-kernel-dev-817e9b4d9e660761e1e613aa294bf77d2e7c7310.zip op-kernel-dev-817e9b4d9e660761e1e613aa294bf77d2e7c7310.tar.gz |
orangefs: specify user pointers when using dev_map_desc and bufmap
Sparse lead me to the dev_map_desc one and Al Viro lead me to the bufmap
one.
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
Diffstat (limited to 'fs/orangefs')
-rw-r--r-- | fs/orangefs/orangefs-bufmap.c | 2 | ||||
-rw-r--r-- | fs/orangefs/protocol.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/orangefs/orangefs-bufmap.c b/fs/orangefs/orangefs-bufmap.c index e3302f8..c4699a1 100644 --- a/fs/orangefs/orangefs-bufmap.c +++ b/fs/orangefs/orangefs-bufmap.c @@ -138,7 +138,7 @@ static int get(struct slot_map *m) /* used to describe mapped buffers */ struct orangefs_bufmap_desc { - void *uaddr; /* user space address pointer */ + void __user *uaddr; /* user space address pointer */ struct page **page_array; /* array of mapped pages */ int array_count; /* size of above arrays */ struct list_head list_link; diff --git a/fs/orangefs/protocol.h b/fs/orangefs/protocol.h index 61ee8d6..d403cf2 100644 --- a/fs/orangefs/protocol.h +++ b/fs/orangefs/protocol.h @@ -342,7 +342,7 @@ enum { * that may be 32 bit! */ struct ORANGEFS_dev_map_desc { - void *ptr; + void __user *ptr; __s32 total_size; __s32 size; __s32 count; |