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

Commit ed66da11 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 fixes from Ted Ts'o:
 "A large number of ext4 bug fixes and cleanups for v4.13"

* tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: fix copy paste error in ext4_swap_extents()
  ext4: fix overflow caused by missing cast in ext4_resize_fs()
  ext4, project: expand inode extra size if possible
  ext4: cleanup ext4_expand_extra_isize_ea()
  ext4: restructure ext4_expand_extra_isize
  ext4: fix forgetten xattr lock protection in ext4_expand_extra_isize
  ext4: make xattr inode reads faster
  ext4: inplace xattr block update fails to deduplicate blocks
  ext4: remove unused mode parameter
  ext4: fix warning about stack corruption
  ext4: fix dir_nlink behaviour
  ext4: silence array overflow warning
  ext4: fix SEEK_HOLE/SEEK_DATA for blocksize < pagesize
  ext4: release discard bio after sending discard commands
  ext4: convert swap_inode_data() over to use swap() on most of the fields
  ext4: error should be cleared if ea_inode isn't added to the cache
  ext4: Don't clear SGID when inheriting ACLs
  ext4: preserve i_mode if __ext4_set_acl() fails
  ext4: remove unused metadata accounting variables
  ext4: correct comment references to ext4_ext_direct_IO()
parents 6ea1bc9b 4e562013

fs/ext4/acl.c

+17 −8
Original line number Diff line number Diff line
@@ -193,13 +193,6 @@ __ext4_set_acl(handle_t *handle, struct inode *inode, int type, 
	switch (type) {

	case ACL_TYPE_ACCESS:

		name_index = EXT4_XATTR_INDEX_POSIX_ACL_ACCESS;

		if (acl) {

			error = posix_acl_update_mode(inode, &inode->i_mode, &acl);

			if (error)

				return error;

			inode->i_ctime = current_time(inode);

			ext4_mark_inode_dirty(handle, inode);

		}

		break;



	case ACL_TYPE_DEFAULT:
@@ -221,8 +214,9 @@ __ext4_set_acl(handle_t *handle, struct inode *inode, int type, 
				      value, size, xattr_flags);



	kfree(value);

	if (!error)

	if (!error) {

		set_cached_acl(inode, type, acl);

	}



	return error;

}
@@ -233,6 +227,8 @@ ext4_set_acl(struct inode *inode, struct posix_acl *acl, int type) 
	handle_t *handle;

	int error, credits, retries = 0;

	size_t acl_size = acl ? ext4_acl_size(acl->a_count) : 0;

	umode_t mode = inode->i_mode;

	int update_mode = 0;



	error = dquot_initialize(inode);

	if (error)
@@ -247,7 +243,20 @@ ext4_set_acl(struct inode *inode, struct posix_acl *acl, int type) 
	if (IS_ERR(handle))

		return PTR_ERR(handle);



	if ((type == ACL_TYPE_ACCESS) && acl) {

		error = posix_acl_update_mode(inode, &mode, &acl);

		if (error)

			goto out_stop;

		update_mode = 1;

	}



	error = __ext4_set_acl(handle, inode, type, acl, 0 /* xattr_flags */);

	if (!error && update_mode) {

		inode->i_mode = mode;

		inode->i_ctime = current_time(inode);

		ext4_mark_inode_dirty(handle, inode);

	}

out_stop:

	ext4_journal_stop(handle);

	if (error == -ENOSPC && ext4_should_retry_alloc(inode->i_sb, &retries))

		goto retry;

fs/ext4/ext4.h

+7 −6
Original line number Diff line number Diff line
@@ -961,7 +961,7 @@ struct ext4_inode_info { 
	/*

	 * i_block_group is the number of the block group which contains

	 * this file's inode.  Constant across the lifetime of the inode,

	 * it is ued for making block allocation decisions - we try to

	 * it is used for making block allocation decisions - we try to

	 * place a file's data blocks near its inode block, and new inodes

	 * near to their parent directory's inode.

	 */
@@ -1049,10 +1049,8 @@ struct ext4_inode_info { 
	ext4_group_t	i_last_alloc_group;



	/* allocation reservation info for delalloc */

	/* In case of bigalloc, these refer to clusters rather than blocks */

	/* In case of bigalloc, this refer to clusters rather than blocks */

	unsigned int i_reserved_data_blocks;

	unsigned int i_reserved_meta_blocks;

	unsigned int i_allocated_meta_blocks;

	ext4_lblk_t i_da_metadata_calc_last_lblock;

	int i_da_metadata_calc_len;
@@ -2022,7 +2020,8 @@ static inline __le16 ext4_rec_len_to_disk(unsigned len, unsigned blocksize) 


#define is_dx(dir) (ext4_has_feature_dir_index((dir)->i_sb) && \

		    ext4_test_inode_flag((dir), EXT4_INODE_INDEX))

#define EXT4_DIR_LINK_MAX(dir) (!is_dx(dir) && (dir)->i_nlink >= EXT4_LINK_MAX)

#define EXT4_DIR_LINK_MAX(dir) unlikely((dir)->i_nlink >= EXT4_LINK_MAX && \

		    !(ext4_has_feature_dir_nlink((dir)->i_sb) && is_dx(dir)))

#define EXT4_DIR_LINK_EMPTY(dir) ((dir)->i_nlink == 2 || (dir)->i_nlink == 1)



/* Legal values for the dx_root hash_version field: */
@@ -2462,6 +2461,8 @@ extern void ext4_process_freed_data(struct super_block *sb, tid_t commit_tid); 
int ext4_inode_is_fast_symlink(struct inode *inode);

struct buffer_head *ext4_getblk(handle_t *, struct inode *, ext4_lblk_t, int);

struct buffer_head *ext4_bread(handle_t *, struct inode *, ext4_lblk_t, int);

int ext4_bread_batch(struct inode *inode, ext4_lblk_t block, int bh_count,

		     bool wait, struct buffer_head **bhs);

int ext4_get_block_unwritten(struct inode *inode, sector_t iblock,

			     struct buffer_head *bh_result, int create);

int ext4_get_block(struct inode *inode, sector_t iblock,
@@ -3074,7 +3075,7 @@ extern int ext4_handle_dirty_dirent_node(handle_t *handle, 
					 struct inode *inode,

					 struct buffer_head *bh);

#define S_SHIFT 12

static const unsigned char ext4_type_by_mode[S_IFMT >> S_SHIFT] = {

static const unsigned char ext4_type_by_mode[(S_IFMT >> S_SHIFT) + 1] = {

	[S_IFREG >> S_SHIFT]	= EXT4_FT_REG_FILE,

	[S_IFDIR >> S_SHIFT]	= EXT4_FT_DIR,

	[S_IFCHR >> S_SHIFT]	= EXT4_FT_CHRDEV,

fs/ext4/ext4_jbd2.h

+3 −0
Original line number Diff line number Diff line
@@ -227,6 +227,9 @@ int ext4_reserve_inode_write(handle_t *handle, struct inode *inode, 


int ext4_mark_inode_dirty(handle_t *handle, struct inode *inode);



int ext4_expand_extra_isize(struct inode *inode,

			    unsigned int new_extra_isize,

			    struct ext4_iloc *iloc);

/*

 * Wrapper functions with which ext4 calls into JBD.

 */

fs/ext4/extents.c

+5 −6
Original line number Diff line number Diff line
@@ -4652,7 +4652,7 @@ int ext4_ext_truncate(handle_t *handle, struct inode *inode) 


static int ext4_alloc_file_blocks(struct file *file, ext4_lblk_t offset,

				  ext4_lblk_t len, loff_t new_size,

				  int flags, int mode)

				  int flags)

{

	struct inode *inode = file_inode(file);

	handle_t *handle;
@@ -4815,7 +4815,7 @@ static long ext4_zero_range(struct file *file, loff_t offset, 
				round_down(offset, 1 << blkbits) >> blkbits,

				(round_up((offset + len), 1 << blkbits) -

				 round_down(offset, 1 << blkbits)) >> blkbits,

				new_size, flags, mode);

				new_size, flags);

		if (ret)

			goto out_dio;
@@ -4841,7 +4841,7 @@ static long ext4_zero_range(struct file *file, loff_t offset, 
		inode->i_mtime = inode->i_ctime = current_time(inode);



		ret = ext4_alloc_file_blocks(file, lblk, max_blocks, new_size,

					     flags, mode);

					     flags);

		up_write(&EXT4_I(inode)->i_mmap_sem);

		if (ret)

			goto out_dio;
@@ -4976,8 +4976,7 @@ long ext4_fallocate(struct file *file, int mode, loff_t offset, loff_t len) 
	ext4_inode_block_unlocked_dio(inode);

	inode_dio_wait(inode);



	ret = ext4_alloc_file_blocks(file, lblk, max_blocks, new_size,

				     flags, mode);

	ret = ext4_alloc_file_blocks(file, lblk, max_blocks, new_size, flags);

	ext4_inode_resume_unlocked_dio(inode);

	if (ret)

		goto out;
@@ -5837,7 +5836,7 @@ ext4_swap_extents(handle_t *handle, struct inode *inode1, 
			if (e1_blk > lblk1)

				next1 = e1_blk;

			if (e2_blk > lblk2)

				next2 = e1_blk;

				next2 = e2_blk;

			/* Do we have something to swap */

			if (next1 == EXT_MAX_BLOCKS || next2 == EXT_MAX_BLOCKS)

				goto finish;

fs/ext4/file.c

+3 −0
Original line number Diff line number Diff line
@@ -537,6 +537,8 @@ static int ext4_find_unwritten_pgoff(struct inode *inode, 
				lastoff = page_offset(page);

				bh = head = page_buffers(page);

				do {

					if (lastoff + bh->b_size <= startoff)

						goto next;

					if (buffer_uptodate(bh) ||

					    buffer_unwritten(bh)) {

						if (whence == SEEK_DATA)
@@ -551,6 +553,7 @@ static int ext4_find_unwritten_pgoff(struct inode *inode, 
						unlock_page(page);

						goto out;

					}

next:

					lastoff += bh->b_size;

					bh = bh->b_this_page;

				} while (bh != head);