From a2c39e54fe0b8f4fd29abe514d9e0b8d772d40f7 Mon Sep 17 00:00:00 2001 From: Lukas Czerner Date: Tue, 24 May 2011 18:28:07 -0400 Subject: [PATCH] --- yaml --- r: 251751 b: refs/heads/master c: 28739eea9cd42598b632972f5cc64a458c5d40b3 h: refs/heads/master i: 251749: b4ef8e9dbc9b2cd0ce8a787743d032171aac2f03 251747: 0a88af69fd79b11aeeb19a35d2b8e3bdfc2a6b87 251743: 0f143c6978edbe2339b89f8503fb6fcfde70b89d v: v3 --- [refs] | 2 +- trunk/fs/ext4/mballoc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5397828c8c7c..67d8e9956614 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 78944086663e6c1b03f3d60bf7610128149be5fc +refs/heads/master: 28739eea9cd42598b632972f5cc64a458c5d40b3 diff --git a/trunk/fs/ext4/mballoc.c b/trunk/fs/ext4/mballoc.c index 38a11bf79329..396b01f5c4fb 100644 --- a/trunk/fs/ext4/mballoc.c +++ b/trunk/fs/ext4/mballoc.c @@ -4825,11 +4825,11 @@ ext4_trim_all_free(struct super_block *sb, ext4_group_t group, "information for %u", group); return ret; } - bitmap = e4b.bd_bitmap; + + ext4_lock_group(sb, group); start = (e4b.bd_info->bb_first_free > start) ? e4b.bd_info->bb_first_free : start; - ext4_lock_group(sb, group); while (start < max) { start = mb_find_next_zero_bit(bitmap, max, start);