From: Lukas Czerner <lczerner@redhat.com>
Date: Wed, 23 Feb 2011 22:49:51 +0000 (-0500)
Subject: ext4: Adjust minlen with discard_granularity in the FITRIM ioctl
X-Git-Tag: v2.6.39-rc1~73^2~36
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5c2ed62fd447;p=karo-tx-linux.git

ext4: Adjust minlen with discard_granularity in the FITRIM ioctl

Discard granularity tells us the minimum size of extent that can be
discarded by the device.  If the user supplies a minimum extent that
should be discarded (range.minlen) which is smaller than the discard
granularity, increase minlen to the discard granularity, since there's
no point submitting trim requests that the device will reject anyway.

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index 25ba7c79d289..c052c9f0f3a1 100644
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -348,6 +348,8 @@ mext_out:
 		    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;