From 682374fa9fe36218088665dab26526e4085ed064 Mon Sep 17 00:00:00 2001 From: Allison Henderson Date: Mon, 16 May 2011 10:11:09 -0400 Subject: [PATCH] --- yaml --- r: 251731 b: refs/heads/master c: 9b940f8e8c32456c8a6428fa4313a4bcca7b4fcb h: refs/heads/master i: 251729: 57dc3e487483b47cde98b67a9f0834c0ab83d045 251727: 36318172464165a4bc5a6c6c6a12aab86d39190e v: v3 --- [refs] | 2 +- trunk/fs/ext4/extents.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index bc47f87b9f96..5a96d04dad2e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b26859027ce0005ef89520af20351360e51ad76 +refs/heads/master: 9b940f8e8c32456c8a6428fa4313a4bcca7b4fcb diff --git a/trunk/fs/ext4/extents.c b/trunk/fs/ext4/extents.c index e363f21b091b..5f243da8ff1d 100644 --- a/trunk/fs/ext4/extents.c +++ b/trunk/fs/ext4/extents.c @@ -2818,8 +2818,8 @@ static int ext4_ext_convert_to_initialized(handle_t *handle, (EXT4_EXT_MAY_ZEROOUT & split_flag)) { /* case 3 */ zero_ex.ee_block = - cpu_to_le32(map->m_lblk + map->m_len); - zero_ex.ee_len = cpu_to_le16(allocated - map->m_len); + cpu_to_le32(map->m_lblk); + zero_ex.ee_len = cpu_to_le16(allocated); ext4_ext_store_pblock(&zero_ex, ext4_ext_pblock(ex) + map->m_lblk - ee_block); err = ext4_ext_zeroout(inode, &zero_ex); @@ -2842,10 +2842,9 @@ static int ext4_ext_convert_to_initialized(handle_t *handle, goto out; } - allocated = map->m_lblk - ee_block + map->m_len; - split_map.m_lblk = ee_block; - split_map.m_len = allocated; + split_map.m_len = map->m_lblk - ee_block + map->m_len; + allocated = map->m_len; } }