Commit ef350bb7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 

Pull ext4 bugfix from Ted Ts'o:
 "Fix a regression introduced in v3.13-rc6"

* tag 'ext4_for_linus_stable' of http://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: fix bigalloc regression
parents a707271a d0abafac

fs/ext4/extents.c

+1 −1
Original line number Diff line number Diff line
@@ -4218,7 +4218,7 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode, 
	 */

	map->m_flags &= ~EXT4_MAP_FROM_CLUSTER;

	newex.ee_block = cpu_to_le32(map->m_lblk);

	cluster_offset = EXT4_LBLK_CMASK(sbi, map->m_lblk);

	cluster_offset = EXT4_LBLK_COFF(sbi, map->m_lblk);



	/*

	 * If we are doing bigalloc, check to see if the extent returned