From e0326214be1b0891b1094779a3a0fa04aefbf90f Mon Sep 17 00:00:00 2001 From: Yongqiang Yang Date: Sat, 29 Oct 2011 09:39:51 -0400 Subject: [PATCH] --- yaml --- r: 273172 b: refs/heads/master c: e7b319e39776bd0e9c0c7855b023dafed2c93d27 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ext4/extents.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 07b241a5b902..3d2a6691e66e 100644 --- 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 index 652b4dc5dfcb..36a0f177ecad 100644 --- 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; }