From: Theodore Ts'o Subject: [PATCH V2] libext2fs: Make ext2fs_extent_set_bmap() more robust against ENOSPC Date: Sat, 11 Jul 2009 10:54:17 -0400 Message-ID: <1247324057-394-1-git-send-email-tytso@mit.edu> Cc: Theodore Ts'o To: Ext4 Developers List Return-path: Received: from thunk.org ([69.25.196.29]:41635 "EHLO thunker.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751090AbZGKOy0 (ORCPT ); Sat, 11 Jul 2009 10:54:26 -0400 Sender: linux-ext4-owner@vger.kernel.org List-ID: In the case where we ext2fs_extent_set_bmap() is replacing the block mapping at the beginning of an already-existing extent, insert a new extent if necessary before shrinking an existing extent, to avoid data loss if the disk is full. This mostly addresses the problem described in Red Hat Bugzilla's statistics are still wrong, but at least the files on the filesystem are not corrupted. If there is a failure during the inode_scan_and_fix pass, the simplest thing to do may be to tell the user to run e2fsck -fy. Addresses-Red-Hat-Bug: #510379 Signed-off-by: "Theodore Ts'o" --- This fixes a corruption which Eric found using the livecd "loop-of-terror". lib/ext2fs/extent.c | 46 +++++++++++++++++++++++++++++++++------------- 1 files changed, 33 insertions(+), 13 deletions(-) diff --git a/lib/ext2fs/extent.c b/lib/ext2fs/extent.c index 4a4fd2c..c3b7c58 100644 --- a/lib/ext2fs/extent.c +++ b/lib/ext2fs/extent.c @@ -1173,7 +1173,6 @@ errcode_t ext2fs_extent_set_bmap(ext2_extent_handle_t handle, orig_height = info.max_depth - info.curr_level; orig_lblk = extent.e_lblk; -again: /* go to the logical spot we want to (re/un)map */ retval = ext2fs_extent_goto(handle, logical); if (retval) { @@ -1270,24 +1269,44 @@ again: #ifdef DEBUG printf("(re/un)mapping first block in extent\n"); #endif + if (physical) { + retval = ext2fs_extent_get(handle, + EXT2_EXTENT_PREV_LEAF, + &extent); + if (extent.e_flags & EXT2_EXTENT_FLAGS_UNINIT) + extent_uninit = 1; + if (retval == EXT2_ET_EXTENT_NO_PREV) { + retval = ext2fs_extent_goto(handle, logical); + if (retval) + goto done; + retval = ext2fs_extent_insert(handle, + 0, &newextent); + } else if (retval) + goto done; + else if ((logical == extent.e_lblk + extent.e_len) && + (physical == extent.e_pblk + extent.e_len) && + (new_uninit == extent_uninit) && + ((int) extent.e_len < max_len-1)) { + extent.e_len++; + retval = ext2fs_extent_replace(handle, 0, + &extent); + } else { + retval = ext2fs_extent_insert(handle, + EXT2_EXTENT_INSERT_AFTER, &newextent); + } + if (retval) + goto done; + } + retval = ext2fs_extent_get(handle, EXT2_EXTENT_NEXT_LEAF, + &extent); + if (retval) + goto done; extent.e_pblk++; extent.e_lblk++; extent.e_len--; retval = ext2fs_extent_replace(handle, 0, &extent); if (retval) goto done; - if (physical) { - /* - * We've removed the old block, now rely on - * the optimized hueristics for adding a new - * mapping with appropriate merging if necessary. - */ - goto again; - } else { - retval = ext2fs_extent_fix_parents(handle); - if (retval) - goto done; - } } else { __u32 orig_length; @@ -1335,6 +1354,7 @@ errcode_t ext2fs_extent_delete(ext2_extent_handle_t handle, int flags) char *cp; struct ext3_extent_header *eh; errcode_t retval = 0; + struct ext2fs_extent extent; EXT2_CHECK_MAGIC(handle, EXT2_ET_MAGIC_EXTENT_HANDLE); -- 1.6.3.2.1.gb9f7d.dirty