From fdbd959ee2863be3559e00d0a7cf538b177a9d57 Mon Sep 17 00:00:00 2001 From: Robin Dong Date: Mon, 11 Jul 2011 18:24:01 -0400 Subject: [PATCH] --- yaml --- r: 262100 b: refs/heads/master c: 598dbdf2433cad55bd44d923f67a053871e3eabf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ext4/extents.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7e888242bdd1..e6dfcd9ccb12 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ffb505ff0f7b52318dea46dd139107a8371b4ad7 +refs/heads/master: 598dbdf2433cad55bd44d923f67a053871e3eabf diff --git a/trunk/fs/ext4/extents.c b/trunk/fs/ext4/extents.c index 9cbdcb2110f5..f1c538e5055c 100644 --- a/trunk/fs/ext4/extents.c +++ b/trunk/fs/ext4/extents.c @@ -1730,9 +1730,10 @@ int ext4_ext_insert_extent(handle_t *handle, struct inode *inode, /* probably next leaf has space for us? */ fex = EXT_LAST_EXTENT(eh); - next = ext4_ext_next_leaf_block(inode, path); - if (le32_to_cpu(newext->ee_block) > le32_to_cpu(fex->ee_block) - && next != EXT_MAX_BLOCKS) { + next = EXT_MAX_BLOCKS; + if (le32_to_cpu(newext->ee_block) > le32_to_cpu(fex->ee_block)) + next = ext4_ext_next_leaf_block(inode, path); + if (next != EXT_MAX_BLOCKS) { ext_debug("next leaf block - %d\n", next); BUG_ON(npath != NULL); npath = ext4_ext_find_extent(inode, next, NULL);