From e5dfb06294f38aabd2edce52ad9c827a2a098104 Mon Sep 17 00:00:00 2001
From: Lukas Czerner <lczerner@redhat.com>
Date: Mon, 22 Nov 2010 12:29:18 +0100
Subject: [PATCH] --- yaml --- r: 229085 b: refs/heads/master c:
 9c52749232b5cef506877ac633ea14083bd17e02 h: refs/heads/master i:   229083:
 7796800e2fec64482dd959cfe5fdf111d0686563 v: v3

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

diff --git a/[refs] b/[refs]
index c7a82d521255..2b004b99685b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b853b96b1dbdc05fc8eae141a595366d8172962b
+refs/heads/master: 9c52749232b5cef506877ac633ea14083bd17e02
diff --git a/trunk/fs/ext3/ioctl.c b/trunk/fs/ext3/ioctl.c
index 88974814783a..fc080dd561f7 100644
--- a/trunk/fs/ext3/ioctl.c
+++ b/trunk/fs/ext3/ioctl.c
@@ -276,7 +276,29 @@ long ext3_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 		mnt_drop_write(filp->f_path.mnt);
 		return err;
 	}
+	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 = ext3_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;