From a1c217323fe1366794c4fd41dd54581b5cb97d21 Mon Sep 17 00:00:00 2001 From: Robin Dong Date: Sun, 17 Jul 2011 23:27:43 -0400 Subject: [PATCH] --- yaml --- r: 262109 b: refs/heads/master c: 015861badd0db43d025bbb538f8fc62dfaf3f18d h: refs/heads/master i: 262107: 85a71d7ee7cc3e2b9909be5b90076cb782d121f5 v: v3 --- [refs] | 2 +- trunk/fs/ext4/extents.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7cbf10b0ee36..a8472ddda014 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c6a0371cbefade85376bbc326d18451860632dce +refs/heads/master: 015861badd0db43d025bbb538f8fc62dfaf3f18d diff --git a/trunk/fs/ext4/extents.c b/trunk/fs/ext4/extents.c index 3d8c5f50ba33..b8acfab00224 100644 --- a/trunk/fs/ext4/extents.c +++ b/trunk/fs/ext4/extents.c @@ -3320,8 +3320,8 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode, trace_ext4_ext_map_blocks_enter(inode, map->m_lblk, map->m_len, flags); /* check in cache */ - if (ext4_ext_in_cache(inode, map->m_lblk, &newex) && - ((flags & EXT4_GET_BLOCKS_PUNCH_OUT_EXT) == 0)) { + if (!(flags & EXT4_GET_BLOCKS_PUNCH_OUT_EXT) && + ext4_ext_in_cache(inode, map->m_lblk, &newex)) { if (!newex.ee_start_lo && !newex.ee_start_hi) { if ((flags & EXT4_GET_BLOCKS_CREATE) == 0) { /*