Commit 575a1d4b authored Jul 10, 2011 by Jiaying Zhang Committed by Theodore Ts'o Jul 10, 2011

ext4: free allocated and pre-allocated blocks when check_eofblocks_fl fails



Upon corrupted inode or disk failures, we may fail after we already
allocate some blocks from the inode or take some blocks from the
inode's preallocation list, but before we successfully insert the
corresponding extent to the extent tree. In this case, we should free
any allocated blocks and discard the inode's preallocated blocks
because the entries in the inode's preallocation list may be in an
inconsistent state.

Signed-off-by: Jiaying Zhang <jiayingz@google.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: stable@kernel.org

parent 7132de74

fs/ext4/extents.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -3560,10 +3560,9 @@ int ext4_ext_map_blocks(handle_t handle, struct inode inode,
		}

		err = check_eofblocks_fl(handle, inode, map->m_lblk, path, ar.len);
		if (err)
		goto out2;

		err = ext4_ext_insert_extent(handle, inode, path, &newex, flags);
		if (!err)
		err = ext4_ext_insert_extent(handle, inode, path,
		&newex, flags);
		if (err) {
		int fb_flags = flags & EXT4_GET_BLOCKS_DELALLOC_RESERVE ?
		EXT4_FREE_BLOCKS_NO_QUOT_UPDATE : 0;

Admin message