From patchwork Thu Oct 20 21:08:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [3/6] ext4: Do not clear EOFBLOCKS_FL too soon Date: Thu, 20 Oct 2011 11:08:56 -0000 From: Dmitri Monakho X-Patchwork-Id: 120882 Message-Id: <1319144939-28801-4-git-send-email-dmonakhov@openvz.org> To: linux-ext4@vger.kernel.org, tytso@mit.edu, achender@linux.vnet.ibm.com Cc: Dmitry Monakhov ext4_ext_insert_extent() may fail due to number of reasons (ENOSPC) so let's update eof flag only after extent was successfully inserted. Signed-off-by: Dmitry Monakhov --- fs/ext4/extents.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 315775e..d81085e 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -4115,10 +4115,7 @@ got_allocated_blocks: map->m_flags |= EXT4_MAP_UNINIT; } - err = check_eofblocks_fl(handle, inode, map->m_lblk, path, ar.len); - if (!err) - err = ext4_ext_insert_extent(handle, inode, path, - &newex, flags); + err = ext4_ext_insert_extent(handle, inode, path, &newex, flags); if (err && free_on_err) { int fb_flags = flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE ? EXT4_FREE_BLOCKS_NO_QUOT_UPDATE : 0; @@ -4130,6 +4127,11 @@ got_allocated_blocks: ext4_ext_get_actual_len(&newex), fb_flags); goto out2; } + err = check_eofblocks_fl(handle, inode, map->m_lblk, path, ar.len); + if (err) { + ext4_discard_preallocations(inode); + goto out2; + } /* previous routine could use block we allocated */ newblock = ext4_ext_pblock(&newex);