From 59294064a936f9ee3ebe425d2113ad2a99153209 Mon Sep 17 00:00:00 2001
From: Tao Ma <boyu.mt@taobao.com>
Date: Sun, 20 Mar 2011 23:16:58 -0400
Subject: [PATCH] --- yaml --- r: 242389 b: refs/heads/master c:
 a56e69c28ad0782a99f3f196e93d57ba5a7e2324 h: refs/heads/master i:   242387:
 709ae657d54e029ae6af60393bc097038b582db8 v: v3

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

diff --git a/[refs] b/[refs]
index 23a03f8aaa54..eb67051d1d3d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d67d1218344009970ba0deb7eb15a3984518ddd0
+refs/heads/master: a56e69c28ad0782a99f3f196e93d57ba5a7e2324
diff --git a/trunk/fs/ext4/ioctl.c b/trunk/fs/ext4/ioctl.c
index c052c9f0f3a1..bb424de9953b 100644
--- a/trunk/fs/ext4/ioctl.c
+++ b/trunk/fs/ext4/ioctl.c
@@ -427,6 +427,7 @@ long ext4_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 		return err;
 	}
 	case EXT4_IOC_MOVE_EXT:
+	case FITRIM:
 		break;
 	default:
 		return -ENOIOCTLCMD;