From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Sandeen Subject: [PATCH] libext2fs: reset handle after inserting new extent Date: Mon, 06 Jul 2009 17:15:07 -0500 Message-ID: <4A52776B.8000203@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit To: ext4 development Return-path: Received: from mx2.redhat.com ([66.187.237.31]:53496 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752757AbZGFWPF (ORCPT ); Mon, 6 Jul 2009 18:15:05 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n66MF9D5012366 for ; Mon, 6 Jul 2009 18:15:09 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n66MF8wa027742 for ; Mon, 6 Jul 2009 18:15:08 -0400 Received: from neon.msp.redhat.com (neon.msp.redhat.com [10.15.80.10]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n66MF7jc019177 for ; Mon, 6 Jul 2009 18:15:08 -0400 Sender: linux-ext4-owner@vger.kernel.org List-ID: Commit 53422e8a5644e22ea3f6e0efba82a765b72e4308 moved the new extent insertion in ext2fs_extent_set_bmap prior to the modification of the original extent, but the insert function left the handle pointing a the new extent; this left us modifying the -new- extent not the original one, and winding up with a corrupt extent tree something like: BLOCKS: (0-1):588791-588792, (0):588791 We need to move back to the previous extent prior to modification, if we inserted a new one. Signed-off-by: Eric Sandeen --- (aside: should there be functions to simply move the handle around, w/o necessarily populating an extent structure?) (aside2: maybe ext2fs_extent_insert should take a flag saying whether the handle should be moved after the insertion; moving it around to back where we want to be seems a bit tedious) diff --git a/lib/ext2fs/extent.c b/lib/ext2fs/extent.c index 35b080e..9ea5c30 100644 --- a/lib/ext2fs/extent.c +++ b/lib/ext2fs/extent.c @@ -1257,6 +1257,11 @@ again: EXT2_EXTENT_INSERT_AFTER, &newextent); if (retval) goto done; + /* Now pointing at new extent; move back to prev */ + retval = ext2fs_extent_get(handle, EXT2_EXTENT_PREV, + &extent); + if (retval) + goto done; } extent.e_len--; retval = ext2fs_extent_replace(handle, 0, &extent);