]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
[PATCH] NFS4: Don't use __user with compat_uptr_t
authorDavid Howells <dhowells@redhat.com>
Wed, 27 Apr 2005 22:39:03 +0000 (15:39 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 27 Apr 2005 22:39:03 +0000 (15:39 -0700)
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 <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
fs/compat.c

index 67c0b94d11485fc4a0449aeb2d911636567daeea..728cd836538427c7836d58ddb0b3b07b7f6598de 100644 (file)
@@ -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)