X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Fsmbfs%2Fioctl.c;h=dbae1f8ea26fad19d288e1093025d7b014cb0417;hb=9213980e6a70d8473e0ffd4b39ab5b6caaba9ff5;hp=912c0460bfc4b67b6d96676c9a0f5e4c765d64d0;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git

diff --git a/fs/smbfs/ioctl.c b/fs/smbfs/ioctl.c
index 912c0460b..dbae1f8ea 100644
--- a/fs/smbfs/ioctl.c
+++ b/fs/smbfs/ioctl.c
@@ -35,11 +35,11 @@ smb_ioctl(struct inode *inode, struct file *filp,
 		uid_t uid32;
 	case SMB_IOC_GETMOUNTUID:
 		SET_UID(uid16, server->mnt->mounted_uid);
-		result = put_user(uid16, (uid16_t *) arg);
+		result = put_user(uid16, (uid16_t __user *) arg);
 		break;
 	case SMB_IOC_GETMOUNTUID32:
 		SET_UID(uid32, server->mnt->mounted_uid);
-		result = put_user(uid32, (uid_t *) arg);
+		result = put_user(uid32, (uid_t __user *) arg);
 		break;
 
 	case SMB_IOC_NEWCONN:
@@ -56,7 +56,7 @@ smb_ioctl(struct inode *inode, struct file *filp,
 		}
 
 		result = -EFAULT;
-		if (!copy_from_user(&opt, (void *)arg, sizeof(opt)))
+		if (!copy_from_user(&opt, (void __user *)arg, sizeof(opt)))
 			result = smb_newconn(server, &opt);
 		break;
 	default: