From 468248739356bca84f83f0cc13b2e7ad75e2f0ab Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.cz>
Date: Mon, 10 Jan 2011 12:30:39 -0500
Subject: [PATCH] --- yaml --- r: 229131 b: refs/heads/master c:
 ca6e909f9bebe709bc65a3ee605ce32969db0452 h: refs/heads/master i:   229129:
 0d8b9d69fb960bf1de23b1af6227a64647e43d1a   229127:
 e7bb9c3e601a7c830d0c92242d3053c290af8c63 v: v3

---
 [refs]                  | 2 +-
 trunk/fs/ext4/mballoc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4d60aab0c137..02b7450dbedd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c5a6cb998854f3c579ecb2bc1423d302bcb1b76
+refs/heads/master: ca6e909f9bebe709bc65a3ee605ce32969db0452
diff --git a/trunk/fs/ext4/mballoc.c b/trunk/fs/ext4/mballoc.c
index d47a80ec231d..21ee30b86de5 100644
--- a/trunk/fs/ext4/mballoc.c
+++ b/trunk/fs/ext4/mballoc.c
@@ -4860,7 +4860,7 @@ int ext4_trim_fs(struct super_block *sb, struct fstrim_range *range)
 		if (len >= EXT4_BLOCKS_PER_GROUP(sb))
 			len -= (EXT4_BLOCKS_PER_GROUP(sb) - first_block);
 		else
-			last_block = len;
+			last_block = first_block + len;
 
 		if (e4b.bd_info->bb_free >= minlen) {
 			cnt = ext4_trim_all_free(sb, &e4b, first_block,