From: David Howells Date: Wed, 27 Apr 2005 22:39:03 +0000 (-0700) Subject: [PATCH] NFS4: Don't use __user with compat_uptr_t X-Git-Tag: v2.6.12-rc4~196 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fc3e624ad7278604628c598e92aa77c67064166;p=linux-2.6 [PATCH] NFS4: Don't use __user with compat_uptr_t The attached patch removes __user from compat_uptr_t types in the NFS4 mount 32-bit->64-bit compatibility structures. Signed-Off-By: David Howells Signed-off-by: Linus Torvalds --- diff --git a/fs/compat.c b/fs/compat.c index 67c0b94d11..728cd83653 100644 --- a/fs/compat.c +++ b/fs/compat.c @@ -809,7 +809,7 @@ static void *do_smb_super_data_conv(void *raw_data) struct compat_nfs_string { compat_uint_t len; - compat_uptr_t __user data; + compat_uptr_t data; }; static inline void compat_nfs_string(struct nfs_string *dst, @@ -834,10 +834,10 @@ struct compat_nfs4_mount_data_v1 { struct compat_nfs_string mnt_path; struct compat_nfs_string hostname; compat_uint_t host_addrlen; - compat_uptr_t __user host_addr; + compat_uptr_t host_addr; compat_int_t proto; compat_int_t auth_flavourlen; - compat_uptr_t __user auth_flavours; + compat_uptr_t auth_flavours; }; static int do_nfs4_super_data_conv(void *raw_data)