vitalif
/
e2fsprogs
mirror of https://github.com/vitalif/e2fsprogs
1
0
Fork 0
Code Issues Releases Wiki Activity

libext2fs: try to roll back when splitting an extent fails 

If a client asks us to remap a block in the middle of an extent, we
potentially have to allocate a fair number of blocks to handle extent
tree splits.  A failure in either of the ext2fs_extent_insert calls
leaves us with an extent tree that no longer maps the logical block in
question and everything that came after it!  Therefore, try to roll
back the extent tree changes before returning an error code.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Zheng Liu <wenqing.lz@taobao.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
maint-test
Darrick J. Wong 2014-02-06 15:34:00 -05:00 committed by Theodore Ts'o
parent 6225a154d2
commit 156a151f31
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/ext2fs/extent.c
View File

@ -1419,13 +1419,17 @@ errcode_t ext2fs_extent_set_bmap(ext2_extent_handle_t handle,
goto done;
} else {
__u32 orig_length;
blk64_t orig_lblk;
struct ext2fs_extent orig_extent;
errcode_t r2;
#ifdef DEBUG
printf("(re/un)mapping in middle of extent\n");
#endif
/* need to split this extent; later */
orig_lblk = extent.e_lblk;
orig_length = extent.e_len;
orig_extent = extent;
/* shorten pre-split extent */
extent.e_len = (logical - extent.e_lblk);
@ -1437,8 +1441,13 @@ errcode_t ext2fs_extent_set_bmap(ext2_extent_handle_t handle,
/* insert new extent after current */
retval = ext2fs_extent_insert(handle,
EXT2_EXTENT_INSERT_AFTER, &newextent);
if (retval)
if (retval) {
r2 = ext2fs_extent_goto(handle, orig_lblk);
if (r2 == 0)
ext2fs_extent_replace(handle, 0,
&orig_extent);
goto done;
}
}
/* add post-split extent */
extent.e_pblk += extent.e_len + 1;
@ -1446,8 +1455,18 @@ errcode_t ext2fs_extent_set_bmap(ext2_extent_handle_t handle,
extent.e_len = orig_length - extent.e_len - 1;
retval = ext2fs_extent_insert(handle,
EXT2_EXTENT_INSERT_AFTER, &extent);
if (retval)
if (retval) {
if (physical) {
r2 = ext2fs_extent_goto(handle,
newextent.e_lblk);
if (r2 == 0)
ext2fs_extent_delete(handle, 0);
}
r2 = ext2fs_extent_goto(handle, orig_lblk);
if (r2 == 0)
ext2fs_extent_replace(handle, 0, &orig_extent);
goto done;
}
}
done: