From 3ca1ed2c2ba5e80eafc06f7859a890d9e7683abb Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Tue, 18 Oct 2011 10:59:51 -0400
Subject: [PATCH] --- yaml --- r: 273144 b: refs/heads/master c:
 e6705f7c255d1ffae7cd161d0b657296f4dd62fd h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/fs/ext4/ioctl.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 46f10e696a74..3c660c8a425b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0cbee3e14195ef07b8ab6ff30930fb93d2e510a
+refs/heads/master: e6705f7c255d1ffae7cd161d0b657296f4dd62fd
diff --git a/trunk/fs/ext4/ioctl.c b/trunk/fs/ext4/ioctl.c
index 8f7ea6905421..a56796814d6a 100644
--- a/trunk/fs/ext4/ioctl.c
+++ b/trunk/fs/ext4/ioctl.c
@@ -350,7 +350,7 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 			return -EOPNOTSUPP;
 		}
 
-		if (copy_from_user(&range, (struct fstrim_range *)arg,
+		if (copy_from_user(&range, (struct fstrim_range __user *)arg,
 		    sizeof(range)))
 			return -EFAULT;
 
@@ -360,7 +360,7 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 		if (ret < 0)
 			return ret;
 
-		if (copy_to_user((struct fstrim_range *)arg, &range,
+		if (copy_to_user((struct fstrim_range __user *)arg, &range,
 		    sizeof(range)))
 			return -EFAULT;