---

yaml
---
r: 229085
b: refs/heads/master
c: 9c52749
h: refs/heads/master
i:
  229083: 7796800
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b853b96b1dbdc05fc8eae141a595366d8172962b
+refs/heads/master: 9c52749232b5cef506877ac633ea14083bd17e02

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;