Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Pull ext4 updates from Ted Ts'o:

 - Add support for online resizing of file systems with bigalloc

 - Fix a two data corruption bugs involving DAX, as well as a corruption
   bug after a crash during a racing fallocate and delayed allocation.

 - Finally, a number of cleanups and optimizations.

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: improve smp scalability for inode generation
  ext4: add support for online resizing with bigalloc
  ext4: mention noload when recovering on read-only device
  Documentation: fix little inconsistencies
  ext4: convert timers to use timer_setup()
  jbd2: convert timers to use timer_setup()
  ext4: remove duplicate extended attributes defs
  ext4: add ext4_should_use_dax()
  ext4: add sanity check for encryption + DAX
  ext4: prevent data corruption with journaling + DAX
  ext4: prevent data corruption with inline data + DAX
  ext4: fix interaction between i_size, fallocate, and delalloc after a crash
  ext4: retry allocations conservatively
  ext4: Switch to iomap for SEEK_HOLE / SEEK_DATA
  ext4: Add iomap support for inline data
  iomap: Add IOMAP_F_DATA_INLINE flag
  iomap: Switch from blkno to disk offset
parents 32190f0a 23253068

fs/buffer.c

+2 −2
Original line number Diff line number Diff line
@@ -1979,8 +1979,8 @@ iomap_to_bh(struct inode *inode, sector_t block, struct buffer_head *bh, 
	case IOMAP_MAPPED:

		if (offset >= i_size_read(inode))

			set_buffer_new(bh);

		bh->b_blocknr = (iomap->blkno >> (inode->i_blkbits - 9)) +

				((offset - iomap->offset) >> inode->i_blkbits);

		bh->b_blocknr = (iomap->addr + offset - iomap->offset) >>

				inode->i_blkbits;

		set_buffer_mapped(bh);

		break;

	}

fs/dax.c

+1 −1
Original line number Diff line number Diff line
@@ -938,7 +938,7 @@ EXPORT_SYMBOL_GPL(__dax_zero_page_range); 


static sector_t dax_iomap_sector(struct iomap *iomap, loff_t pos)

{

	return iomap->blkno + (((pos & PAGE_MASK) - iomap->offset) >> 9);

	return (iomap->addr + (pos & PAGE_MASK) - iomap->offset) >> 9;

}



static loff_t

fs/ext2/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -821,11 +821,11 @@ static int ext2_iomap_begin(struct inode *inode, loff_t offset, loff_t length, 


	if (ret == 0) {

		iomap->type = IOMAP_HOLE;

		iomap->blkno = IOMAP_NULL_BLOCK;

		iomap->addr = IOMAP_NULL_ADDR;

		iomap->length = 1 << blkbits;

	} else {

		iomap->type = IOMAP_MAPPED;

		iomap->blkno = (sector_t)bno << (blkbits - 9);

		iomap->addr = (u64)bno << blkbits;

		iomap->length = (u64)ret << blkbits;

		iomap->flags |= IOMAP_F_MERGED;

	}

fs/ext4/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ config EXT4_FS 
	select CRC16

	select CRYPTO

	select CRYPTO_CRC32C

	select FS_IOMAP

	help

	  This is the next generation of the ext3 filesystem.

fs/ext4/balloc.c

+7 −8
Original line number Diff line number Diff line
@@ -601,21 +601,20 @@ int ext4_claim_free_clusters(struct ext4_sb_info *sbi, 
 * ext4_should_retry_alloc() is called when ENOSPC is returned, and if

 * it is profitable to retry the operation, this function will wait

 * for the current or committing transaction to complete, and then

 * return TRUE.

 *

 * if the total number of retries exceed three times, return FALSE.

 * return TRUE.  We will only retry once.

 */

int ext4_should_retry_alloc(struct super_block *sb, int *retries)

{

	if (!ext4_has_free_clusters(EXT4_SB(sb), 1, 0) ||

	    (*retries)++ > 3 ||

	    (*retries)++ > 1 ||

	    !EXT4_SB(sb)->s_journal)

		return 0;



	jbd_debug(1, "%s: retrying operation after ENOSPC\n", sb->s_id);



	smp_mb();

	if (EXT4_SB(sb)->s_mb_free_pending)

	if (EXT4_SB(sb)->s_mb_free_pending == 0)

		return 0;



	jbd_debug(1, "%s: retrying operation after ENOSPC\n", sb->s_id);

	jbd2_journal_force_commit_nested(EXT4_SB(sb)->s_journal);

	return 1;

}