From 8079f133cb340a7e4af25edb6b19730997c6ea5b Mon Sep 17 00:00:00 2001
From: Lukas Czerner <lczerner@redhat.com>
Date: Wed, 23 Feb 2011 17:49:51 -0500
Subject: [PATCH] --- yaml --- r: 242359 b: refs/heads/master c:
 5c2ed62fd447e2c696e222dcf71d1322bbbc58d4 h: refs/heads/master i:   242357:
 f8960c101441987c26575b8f69e4fa6a9eebf587   242355:
 9cf5a1b9fc95385d6352b599549f6cdf004235b1   242351:
 8c06d9c262dd96ac1adbbf31d1429b6e66976f44 v: v3

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

diff --git a/[refs] b/[refs]
index c279febf76ff..1ffaa77d06bb 100644
--- 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
index 25ba7c79d289..c052c9f0f3a1 100644
--- 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;