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

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

Merge branch 'for_linus' into for_linus_merged 

Conflicts:
	fs/ext4/ioctl.c
parents e4e11180 d50f2ab6

Documentation/filesystems/ext4.txt

+7 −0
Original line number Diff line number Diff line
@@ -581,6 +581,13 @@ Table of Ext4 specific ioctls 
			      behaviour may change in the future as it is

			      not necessary and has been done this way only

			      for sake of simplicity.



 EXT4_IOC_RESIZE_FS	      Resize the filesystem to a new size.  The number

			      of blocks of resized filesystem is passed in via

			      64 bit integer argument.  The kernel allocates

			      bitmaps and inode table, the userspace tool thus

			      just passes the new number of blocks.



..............................................................................



References

fs/ext4/balloc.c

+3 −1
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 


#include <trace/events/ext4.h>



static unsigned ext4_num_base_meta_clusters(struct super_block *sb,

					    ext4_group_t block_group);

/*

 * balloc.c contains the blocks allocation and deallocation routines

 */
@@ -668,7 +670,7 @@ unsigned long ext4_bg_num_gdb(struct super_block *sb, ext4_group_t group) 
 * This function returns the number of file system metadata clusters at

 * the beginning of a block group, including the reserved gdt blocks.

 */

unsigned ext4_num_base_meta_clusters(struct super_block *sb,

static unsigned ext4_num_base_meta_clusters(struct super_block *sb,

				     ext4_group_t block_group)

{

	struct ext4_sb_info *sbi = EXT4_SB(sb);

fs/ext4/ext4.h

+17 −12
Original line number Diff line number Diff line
@@ -511,6 +511,14 @@ struct ext4_new_group_data { 
	__u32 free_blocks_count;

};



/* Indexes used to index group tables in ext4_new_group_data */

enum {

	BLOCK_BITMAP = 0,	/* block bitmap */

	INODE_BITMAP,		/* inode bitmap */

	INODE_TABLE,		/* inode tables */

	GROUP_TABLE_COUNT,

};



/*

 * Flags used by ext4_map_blocks()

 */
@@ -575,6 +583,7 @@ struct ext4_new_group_data { 
 /* note ioctl 11 reserved for filesystem-independent FIEMAP ioctl */

#define EXT4_IOC_ALLOC_DA_BLKS		_IO('f', 12)

#define EXT4_IOC_MOVE_EXT		_IOWR('f', 15, struct move_extent)

#define EXT4_IOC_RESIZE_FS		_IOW('f', 16, __u64)



#if defined(__KERNEL__) && defined(CONFIG_COMPAT)

/*
@@ -957,12 +966,13 @@ struct ext4_inode_info { 
#define test_opt2(sb, opt)		(EXT4_SB(sb)->s_mount_opt2 & \

					 EXT4_MOUNT2_##opt)



#define ext4_set_bit			__test_and_set_bit_le

#define ext4_test_and_set_bit		__test_and_set_bit_le

#define ext4_set_bit			__set_bit_le

#define ext4_set_bit_atomic		ext2_set_bit_atomic

#define ext4_clear_bit			__test_and_clear_bit_le

#define ext4_test_and_clear_bit		__test_and_clear_bit_le

#define ext4_clear_bit			__clear_bit_le

#define ext4_clear_bit_atomic		ext2_clear_bit_atomic

#define ext4_test_bit			test_bit_le

#define ext4_find_first_zero_bit	find_first_zero_bit_le

#define ext4_find_next_zero_bit		find_next_zero_bit_le

#define ext4_find_next_bit		find_next_bit_le
@@ -1397,6 +1407,7 @@ static inline void ext4_clear_state_flags(struct ext4_inode_info *ei) 
#define EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE	0x0040

#define EXT4_FEATURE_RO_COMPAT_QUOTA		0x0100

#define EXT4_FEATURE_RO_COMPAT_BIGALLOC		0x0200

#define EXT4_FEATURE_RO_COMPAT_METADATA_CSUM	0x0400



#define EXT4_FEATURE_INCOMPAT_COMPRESSION	0x0001

#define EXT4_FEATURE_INCOMPAT_FILETYPE		0x0002
@@ -1409,6 +1420,8 @@ static inline void ext4_clear_state_flags(struct ext4_inode_info *ei) 
#define EXT4_FEATURE_INCOMPAT_FLEX_BG		0x0200

#define EXT4_FEATURE_INCOMPAT_EA_INODE		0x0400 /* EA in inode */

#define EXT4_FEATURE_INCOMPAT_DIRDATA		0x1000 /* data in dirent */

#define EXT4_FEATURE_INCOMPAT_INLINEDATA	0x2000 /* data in inode */

#define EXT4_FEATURE_INCOMPAT_LARGEDIR		0x4000 /* >2GB or 3-lvl htree */



#define EXT2_FEATURE_COMPAT_SUPP	EXT4_FEATURE_COMPAT_EXT_ATTR

#define EXT2_FEATURE_INCOMPAT_SUPP	(EXT4_FEATURE_INCOMPAT_FILETYPE| \
@@ -1790,8 +1803,6 @@ extern void ext4_init_block_bitmap(struct super_block *sb, 
extern unsigned ext4_free_clusters_after_init(struct super_block *sb,

					      ext4_group_t block_group,

					      struct ext4_group_desc *gdp);

extern unsigned ext4_num_base_meta_clusters(struct super_block *sb,

					    ext4_group_t block_group);

extern unsigned ext4_num_overhead_clusters(struct super_block *sb,

					   ext4_group_t block_group,

					   struct ext4_group_desc *gdp);
@@ -1880,16 +1891,9 @@ extern int ext4_alloc_da_blocks(struct inode *inode); 
extern void ext4_set_aops(struct inode *inode);

extern int ext4_writepage_trans_blocks(struct inode *);

extern int ext4_chunk_trans_blocks(struct inode *, int nrblocks);

extern int ext4_block_truncate_page(handle_t *handle,

		struct address_space *mapping, loff_t from);

extern int ext4_block_zero_page_range(handle_t *handle,

		struct address_space *mapping, loff_t from, loff_t length);

extern int ext4_discard_partial_page_buffers(handle_t *handle,

		struct address_space *mapping, loff_t from,

		loff_t length, int flags);

extern int ext4_discard_partial_page_buffers_no_lock(handle_t *handle,

		struct inode *inode, struct page *page, loff_t from,

		loff_t length, int flags);

extern int ext4_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf);

extern qsize_t *ext4_get_reserved_space(struct inode *inode);

extern void ext4_da_update_reserve_space(struct inode *inode,
@@ -1924,6 +1928,7 @@ extern int ext4_group_add(struct super_block *sb, 
extern int ext4_group_extend(struct super_block *sb,

				struct ext4_super_block *es,

				ext4_fsblk_t n_blocks_count);

extern int ext4_resize_fs(struct super_block *sb, ext4_fsblk_t n_blocks_count);



/* super.c */

extern void *ext4_kvmalloc(size_t size, gfp_t flags);

fs/ext4/extents.c

+6 −4
Original line number Diff line number Diff line
@@ -3280,6 +3280,9 @@ static int ext4_find_delalloc_range(struct inode *inode, 
	ext4_lblk_t i, pg_lblk;

	pgoff_t index;



	if (!test_opt(inode->i_sb, DELALLOC))

		return 0;



	/* reverse search wont work if fs block size is less than page size */

	if (inode->i_blkbits < PAGE_CACHE_SHIFT)

		search_hint_reverse = 0;
@@ -3453,7 +3456,7 @@ ext4_ext_handle_uninitialized_extents(handle_t *handle, struct inode *inode, 
	ext4_io_end_t *io = EXT4_I(inode)->cur_aio_dio;



	ext_debug("ext4_ext_handle_uninitialized_extents: inode %lu, logical "

		  "block %llu, max_blocks %u, flags %d, allocated %u",

		  "block %llu, max_blocks %u, flags %x, allocated %u\n",

		  inode->i_ino, (unsigned long long)map->m_lblk, map->m_len,

		  flags, allocated);

	ext4_ext_show_leaf(inode, path);
@@ -3624,7 +3627,7 @@ static int get_implied_cluster_alloc(struct super_block *sb, 
	struct ext4_sb_info *sbi = EXT4_SB(sb);

	ext4_lblk_t c_offset = map->m_lblk & (sbi->s_cluster_ratio-1);

	ext4_lblk_t ex_cluster_start, ex_cluster_end;

	ext4_lblk_t rr_cluster_start, rr_cluster_end;

	ext4_lblk_t rr_cluster_start;

	ext4_lblk_t ee_block = le32_to_cpu(ex->ee_block);

	ext4_fsblk_t ee_start = ext4_ext_pblock(ex);

	unsigned short ee_len = ext4_ext_get_actual_len(ex);
@@ -3635,7 +3638,6 @@ static int get_implied_cluster_alloc(struct super_block *sb, 


	/* The requested region passed into ext4_map_blocks() */

	rr_cluster_start = EXT4_B2C(sbi, map->m_lblk);

	rr_cluster_end = EXT4_B2C(sbi, map->m_lblk + map->m_len - 1);



	if ((rr_cluster_start == ex_cluster_end) ||

	    (rr_cluster_start == ex_cluster_start)) {

fs/ext4/ialloc.c

+11 −7
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ void ext4_free_inode(handle_t *handle, struct inode *inode) 
		fatal = ext4_journal_get_write_access(handle, bh2);

	}

	ext4_lock_group(sb, block_group);

	cleared = ext4_clear_bit(bit, bitmap_bh->b_data);

	cleared = ext4_test_and_clear_bit(bit, bitmap_bh->b_data);

	if (fatal || !cleared) {

		ext4_unlock_group(sb, block_group);

		goto out;
@@ -358,7 +358,7 @@ static int find_group_orlov(struct super_block *sb, struct inode *parent, 
	struct ext4_sb_info *sbi = EXT4_SB(sb);

	ext4_group_t real_ngroups = ext4_get_groups_count(sb);

	int inodes_per_group = EXT4_INODES_PER_GROUP(sb);

	unsigned int freei, avefreei;

	unsigned int freei, avefreei, grp_free;

	ext4_fsblk_t freeb, avefreec;

	unsigned int ndirs;

	int max_dirs, min_inodes;
@@ -477,8 +477,8 @@ fallback_retry: 
	for (i = 0; i < ngroups; i++) {

		grp = (parent_group + i) % ngroups;

		desc = ext4_get_group_desc(sb, grp, NULL);

		if (desc && ext4_free_inodes_count(sb, desc) &&

		    ext4_free_inodes_count(sb, desc) >= avefreei) {

		grp_free = ext4_free_inodes_count(sb, desc);

		if (desc && grp_free && grp_free >= avefreei) {

			*group = grp;

			return 0;

		}
@@ -618,7 +618,7 @@ static int ext4_claim_inode(struct super_block *sb, 
	 */

	down_read(&grp->alloc_sem);

	ext4_lock_group(sb, group);

	if (ext4_set_bit(ino, inode_bitmap_bh->b_data)) {

	if (ext4_test_and_set_bit(ino, inode_bitmap_bh->b_data)) {

		/* not a free inode */

		retval = 1;

		goto err_ret;
@@ -885,8 +885,12 @@ got: 
	if (IS_DIRSYNC(inode))

		ext4_handle_sync(handle);

	if (insert_inode_locked(inode) < 0) {

		err = -EINVAL;

		goto fail_drop;

		/*

		 * Likely a bitmap corruption causing inode to be allocated

		 * twice.

		 */

		err = -EIO;

		goto fail;

	}

	spin_lock(&sbi->s_next_gen_lock);

	inode->i_generation = sbi->s_next_generation++;