From 3497e2e0237cb3f960d3561e73f4260bf20cd179 Mon Sep 17 00:00:00 2001
From: Tao Ma <boyu.mt@taobao.com>
Date: Mon, 23 May 2011 10:36:44 +0800
Subject: [PATCH] --- yaml --- r: 251791 b: refs/heads/master c:
 55e67872b67ebd30d1326067cdba53a622ab497d h: refs/heads/master i:   251789:
 dcc43c615b885128687c0e0f350a4ae1db979ec3   251787:
 9fba5c126c26d5ef0bcb98d8eb0bde4109505fcf   251783:
 d4ac77b159be4bbecd3fba3a993ff3a17edc598d   251775:
 bec92d8a63c270b1423d831ad1a3b41fa9086795 v: v3

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

diff --git a/[refs] b/[refs]
index 8f2aa44c3aff..b85775dfed44 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e80de36d8dbff216a384e9204e54d59deeadf344
+refs/heads/master: 55e67872b67ebd30d1326067cdba53a622ab497d
diff --git a/trunk/fs/ocfs2/ioctl.c b/trunk/fs/ocfs2/ioctl.c
index 8f13c5989eae..312a28f433a4 100644
--- a/trunk/fs/ocfs2/ioctl.c
+++ b/trunk/fs/ocfs2/ioctl.c
@@ -542,6 +542,29 @@ long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 			return -EFAULT;
 
 		return ocfs2_info_handle(inode, &info, 0);
+	case FITRIM:
+	{
+		struct super_block *sb = inode->i_sb;
+		struct fstrim_range range;
+		int ret = 0;
+
+		if (!capable(CAP_SYS_ADMIN))
+			return -EPERM;
+
+		if (copy_from_user(&range, (struct fstrim_range *)arg,
+		    sizeof(range)))
+			return -EFAULT;
+
+		ret = ocfs2_trim_fs(sb, &range);
+		if (ret < 0)
+			return ret;
+
+		if (copy_to_user((struct fstrim_range *)arg, &range,
+		    sizeof(range)))
+			return -EFAULT;
+
+		return 0;
+	}
 	default:
 		return -ENOTTY;
 	}
@@ -569,6 +592,7 @@ long ocfs2_compat_ioctl(struct file *file, unsigned cmd, unsigned long arg)
 	case OCFS2_IOC_GROUP_EXTEND:
 	case OCFS2_IOC_GROUP_ADD:
 	case OCFS2_IOC_GROUP_ADD64:
+	case FITRIM:
 		break;
 	case OCFS2_IOC_REFLINK:
 		if (copy_from_user(&args, (struct reflink_arguments *)arg,