---

yaml --- r: 242359 b: refs/heads/master c: 5c2ed62 h: refs/heads/master i: 242357: f8960c1 242355: 9cf5a1b 242351: 8c06d9c v: v3
git-mirror · Feb 23, 2011 · 8079f13 · 8079f13
1 parent 648cbb6
commit 8079f13
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4143179218960a70d821a425e3c23ce44aa93dee
+refs/heads/master: 5c2ed62fd447e2c696e222dcf71d1322bbbc58d4
diff --git a/trunk/fs/ext4/ioctl.c b/trunk/fs/ext4/ioctl.c
@@ -348,6 +348,8 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 		    sizeof(range)))
 			return -EFAULT;
 
+		range.minlen = max((unsigned int)range.minlen,
+				   q->limits.discard_granularity);
 		ret = ext4_trim_fs(sb, &range);
 		if (ret < 0)
 			return ret;