[PATCH] NFS4: Don't use __user with compat_uptr_t

[David Howells]

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@xxxxxxxxxx>
---
warthog>diffstat -p1 nfs4-compat-2612rc3.diff 
 fs/compat.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff -uNrp linux-2.6.12-rc3/fs/compat.c linux-2.6.12-rc3-nfs4compat/fs/compat.c
--- linux-2.6.12-rc3/fs/compat.c	2005-04-27 10:21:13.660310933 +0100
+++ linux-2.6.12-rc3-nfs4compat/fs/compat.c	2005-04-27 10:24:09.176911721 +0100
@@ -809,7 +809,7 @@ static void *do_smb_super_data_conv(void
 
 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)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/