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

Commit a107e5a3 authored by Theodore Ts'o's avatar Theodore Ts'o
Browse files

Merge branch 'next' into upstream-merge 

Conflicts:
	fs/ext4/inode.c
	fs/ext4/mballoc.c
	include/trace/events/ext4.h
parents e3e1288e a269029d

Documentation/filesystems/ext4.txt

+14 −0
Original line number Diff line number Diff line
@@ -353,6 +353,20 @@ noauto_da_alloc replacing existing files via patterns such as 
			system crashes before the delayed allocation

			blocks are forced to disk.



noinit_itable		Do not initialize any uninitialized inode table

			blocks in the background.  This feature may be

			used by installation CD's so that the install

			process can complete as quickly as possible; the

			inode table initialization process would then be

			deferred until the next time the  file system

			is unmounted.



init_itable=n		The lazy itable init code will wait n times the

			number of milliseconds it took to zero out the

			previous block group's inode table.  This

			minimizes the impact on the systme performance

			while file system's inode table is being initialized.



discard		Controls whether ext4 should issue discard/TRIM

nodiscard(*)		commands to the underlying block device when

			blocks are freed.  This is useful for SSD devices

fs/ext4/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


obj-$(CONFIG_EXT4_FS) += ext4.o



ext4-y	:= balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \

ext4-y	:= balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o page-io.o \

		ioctl.o namei.o super.o symlink.o hash.o resize.o extents.o \

		ext4_jbd2.o migrate.o mballoc.o block_validity.o move_extent.o

fs/ext4/balloc.c

+3 −2
Original line number Diff line number Diff line
@@ -171,7 +171,8 @@ unsigned ext4_init_block_bitmap(struct super_block *sb, struct buffer_head *bh, 
		 * less than the blocksize * 8 ( which is the size

		 * of bitmap ), set rest of the block bitmap to 1

		 */

		mark_bitmap_end(group_blocks, sb->s_blocksize * 8, bh->b_data);

		ext4_mark_bitmap_end(group_blocks, sb->s_blocksize * 8,

				     bh->b_data);

	}

	return free_blocks - ext4_group_used_meta_blocks(sb, block_group, gdp);

}
@@ -489,7 +490,7 @@ void ext4_add_groupblocks(handle_t *handle, struct super_block *sb, 
 * Check if filesystem has nblocks free & available for allocation.

 * On success return 1, return 0 on failure.

 */

int ext4_has_free_blocks(struct ext4_sb_info *sbi, s64 nblocks)

static int ext4_has_free_blocks(struct ext4_sb_info *sbi, s64 nblocks)

{

	s64 free_blocks, dirty_blocks, root_blocks;

	struct percpu_counter *fbc = &sbi->s_freeblocks_counter;

fs/ext4/block_validity.c

+3 −4
Original line number Diff line number Diff line
@@ -29,16 +29,15 @@ struct ext4_system_zone { 


static struct kmem_cache *ext4_system_zone_cachep;



int __init init_ext4_system_zone(void)

int __init ext4_init_system_zone(void)

{

	ext4_system_zone_cachep = KMEM_CACHE(ext4_system_zone,

					     SLAB_RECLAIM_ACCOUNT);

	ext4_system_zone_cachep = KMEM_CACHE(ext4_system_zone, 0);

	if (ext4_system_zone_cachep == NULL)

		return -ENOMEM;

	return 0;

}



void exit_ext4_system_zone(void)

void ext4_exit_system_zone(void)

{

	kmem_cache_destroy(ext4_system_zone_cachep);

}

fs/ext4/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static int ext4_release_dir(struct inode *inode, 
				struct file *filp);



const struct file_operations ext4_dir_operations = {

	.llseek		= generic_file_llseek,

	.llseek		= ext4_llseek,

	.read		= generic_read_dir,

	.readdir	= ext4_readdir,		/* we take BKL. needed?*/

	.unlocked_ioctl = ext4_ioctl,