---

yaml --- r: 273172 b: refs/heads/master c: e7b319e h: refs/heads/master v: v3
git-mirror · Oct 29, 2011 · e032621 · e032621
1 parent df17e63
commit e032621
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02dc62fba89eaee0157752c5f1ba811ef3156e00
+refs/heads/master: e7b319e39776bd0e9c0c7855b023dafed2c93d27
diff --git a/trunk/fs/ext4/extents.c b/trunk/fs/ext4/extents.c
@@ -4171,12 +4171,12 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode,
 		ext4_ext_drop_refs(path);
 		kfree(path);
 	}
-	trace_ext4_ext_map_blocks_exit(inode, map->m_lblk,
-		newblock, map->m_len, err ? err : allocated);
-
 	result = (flags & EXT4_GET_BLOCKS_PUNCH_OUT_EXT) ?
 			punched_out : allocated;
 
+	trace_ext4_ext_map_blocks_exit(inode, map->m_lblk,
+		newblock, map->m_len, err ? err : result);
+
 	return err ? err : result;
 }