Commit f6b1495f 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:
 "All cleanups and bug fixes; most notably, fix some problems discovered
  in ext4's NFS support, and fix an ioctl (EXT4_IOC_GROUP_ADD) used by
  old versions of e2fsprogs which we accidentally broke a while back.

  Also fixed some error paths in ext4's quota and inline data support.

  Finally, improve tail latency in jbd2's commit code"

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: check for shutdown and r/o file system in ext4_write_inode()
  ext4: force inode writes when nfsd calls commit_metadata()
  ext4: avoid declaring fs inconsistent due to invalid file handles
  ext4: include terminating u32 in size of xattr entries when expanding inodes
  ext4: compare old and new mode before setting update_mode flag
  ext4: fix EXT4_IOC_GROUP_ADD ioctl
  ext4: hard fail dax mount on unsupported devices
  jbd2: update locking documentation for transaction_t
  ext4: remove redundant condition check
  jbd2: clean up indentation issue, replace spaces with tab
  ext4: clean up indentation issues, remove extraneous tabs
  ext4: missing unlock/put_page() in ext4_try_to_write_inline_data()
  ext4: fix possible use after free in ext4_quota_enable
  jbd2: avoid long hold times of j_state_lock while committing a transaction
  ext4: add ext4_sb_bread() to disambiguate ENOMEM cases
parents bc77789a 18f2c4fc

fs/ext4/acl.c

+2 −1
Original line number Diff line number Diff line
@@ -248,6 +248,7 @@ retry: 
		error = posix_acl_update_mode(inode, &mode, &acl);

		if (error)

			goto out_stop;

		if (mode != inode->i_mode)

			update_mode = 1;

	}

fs/ext4/ext4.h

+15 −2
Original line number Diff line number Diff line
@@ -2454,8 +2454,19 @@ int do_journal_get_write_access(handle_t *handle, 
#define FALL_BACK_TO_NONDELALLOC 1

#define CONVERT_INLINE_DATA	 2



extern struct inode *ext4_iget(struct super_block *, unsigned long);

extern struct inode *ext4_iget_normal(struct super_block *, unsigned long);

typedef enum {

	EXT4_IGET_NORMAL =	0,

	EXT4_IGET_SPECIAL =	0x0001, /* OK to iget a system inode */

	EXT4_IGET_HANDLE = 	0x0002	/* Inode # is from a handle */

} ext4_iget_flags;



extern struct inode *__ext4_iget(struct super_block *sb, unsigned long ino,

				 ext4_iget_flags flags, const char *function,

				 unsigned int line);



#define ext4_iget(sb, ino, flags) \

	__ext4_iget((sb), (ino), (flags), __func__, __LINE__)



extern int  ext4_write_inode(struct inode *, struct writeback_control *);

extern int  ext4_setattr(struct dentry *, struct iattr *);

extern int  ext4_getattr(const struct path *, struct kstat *, u32, unsigned int);
@@ -2538,6 +2549,8 @@ extern int ext4_group_extend(struct super_block *sb, 
extern int ext4_resize_fs(struct super_block *sb, ext4_fsblk_t n_blocks_count);



/* super.c */

extern struct buffer_head *ext4_sb_bread(struct super_block *sb,

					 sector_t block, int op_flags);

extern int ext4_seq_options_show(struct seq_file *seq, void *offset);

extern int ext4_calculate_overhead(struct super_block *sb);

extern void ext4_superblock_csum_set(struct super_block *sb);

fs/ext4/ialloc.c

+1 −1
Original line number Diff line number Diff line
@@ -1225,7 +1225,7 @@ struct inode *ext4_orphan_get(struct super_block *sb, unsigned long ino) 
	if (!ext4_test_bit(bit, bitmap_bh->b_data))

		goto bad_orphan;



	inode = ext4_iget(sb, ino);

	inode = ext4_iget(sb, ino, EXT4_IGET_NORMAL);

	if (IS_ERR(inode)) {

		err = PTR_ERR(inode);

		ext4_error(sb, "couldn't read orphan inode %lu (err %d)",

fs/ext4/inline.c

+4 −1
Original line number Diff line number Diff line
@@ -705,9 +705,12 @@ int ext4_try_to_write_inline_data(struct address_space *mapping, 


	if (!PageUptodate(page)) {

		ret = ext4_read_inline_page(inode, page);

		if (ret < 0)

		if (ret < 0) {

			unlock_page(page);

			put_page(page);

			goto out_up_read;

		}

	}



	ret = 1;

	handle = NULL;

fs/ext4/inode.c

+44 −19
Original line number Diff line number Diff line
@@ -4817,7 +4817,9 @@ static inline u64 ext4_inode_peek_iversion(const struct inode *inode) 
		return inode_peek_iversion(inode);

}



struct inode *ext4_iget(struct super_block *sb, unsigned long ino)

struct inode *__ext4_iget(struct super_block *sb, unsigned long ino,

			  ext4_iget_flags flags, const char *function,

			  unsigned int line)

{

	struct ext4_iloc iloc;

	struct ext4_inode *raw_inode;
@@ -4831,6 +4833,18 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino) 
	gid_t i_gid;

	projid_t i_projid;



	if (((flags & EXT4_IGET_NORMAL) &&

	     (ino < EXT4_FIRST_INO(sb) && ino != EXT4_ROOT_INO)) ||

	    (ino < EXT4_ROOT_INO) ||

	    (ino > le32_to_cpu(EXT4_SB(sb)->s_es->s_inodes_count))) {

		if (flags & EXT4_IGET_HANDLE)

			return ERR_PTR(-ESTALE);

		__ext4_error(sb, function, line,

			     "inode #%lu: comm %s: iget: illegal inode #",

			     ino, current->comm);

		return ERR_PTR(-EFSCORRUPTED);

	}



	inode = iget_locked(sb, ino);

	if (!inode)

		return ERR_PTR(-ENOMEM);
@@ -4846,18 +4860,26 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino) 
	raw_inode = ext4_raw_inode(&iloc);



	if ((ino == EXT4_ROOT_INO) && (raw_inode->i_links_count == 0)) {

		EXT4_ERROR_INODE(inode, "root inode unallocated");

		ext4_error_inode(inode, function, line, 0,

				 "iget: root inode unallocated");

		ret = -EFSCORRUPTED;

		goto bad_inode;

	}



	if ((flags & EXT4_IGET_HANDLE) &&

	    (raw_inode->i_links_count == 0) && (raw_inode->i_mode == 0)) {

		ret = -ESTALE;

		goto bad_inode;

	}



	if (EXT4_INODE_SIZE(inode->i_sb) > EXT4_GOOD_OLD_INODE_SIZE) {

		ei->i_extra_isize = le16_to_cpu(raw_inode->i_extra_isize);

		if (EXT4_GOOD_OLD_INODE_SIZE + ei->i_extra_isize >

			EXT4_INODE_SIZE(inode->i_sb) ||

		    (ei->i_extra_isize & 3)) {

			EXT4_ERROR_INODE(inode,

					 "bad extra_isize %u (inode size %u)",

			ext4_error_inode(inode, function, line, 0,

					 "iget: bad extra_isize %u "

					 "(inode size %u)",

					 ei->i_extra_isize,

					 EXT4_INODE_SIZE(inode->i_sb));

			ret = -EFSCORRUPTED;
@@ -4879,7 +4901,8 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino) 
	}



	if (!ext4_inode_csum_verify(inode, raw_inode, ei)) {

		EXT4_ERROR_INODE(inode, "checksum invalid");

		ext4_error_inode(inode, function, line, 0,

				 "iget: checksum invalid");

		ret = -EFSBADCRC;

		goto bad_inode;

	}
@@ -4936,7 +4959,8 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino) 
			((__u64)le16_to_cpu(raw_inode->i_file_acl_high)) << 32;

	inode->i_size = ext4_isize(sb, raw_inode);

	if ((size = i_size_read(inode)) < 0) {

		EXT4_ERROR_INODE(inode, "bad i_size value: %lld", size);

		ext4_error_inode(inode, function, line, 0,

				 "iget: bad i_size value: %lld", size);

		ret = -EFSCORRUPTED;

		goto bad_inode;

	}
@@ -5012,7 +5036,8 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino) 
	ret = 0;

	if (ei->i_file_acl &&

	    !ext4_data_block_valid(EXT4_SB(sb), ei->i_file_acl, 1)) {

		EXT4_ERROR_INODE(inode, "bad extended attribute block %llu",

		ext4_error_inode(inode, function, line, 0,

				 "iget: bad extended attribute block %llu",

				 ei->i_file_acl);

		ret = -EFSCORRUPTED;

		goto bad_inode;
@@ -5040,8 +5065,9 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino) 
	} else if (S_ISLNK(inode->i_mode)) {

		/* VFS does not allow setting these so must be corruption */

		if (IS_APPEND(inode) || IS_IMMUTABLE(inode)) {

			EXT4_ERROR_INODE(inode,

			  "immutable or append flags not allowed on symlinks");

			ext4_error_inode(inode, function, line, 0,

					 "iget: immutable or append flags "

					 "not allowed on symlinks");

			ret = -EFSCORRUPTED;

			goto bad_inode;

		}
@@ -5071,7 +5097,8 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino) 
		make_bad_inode(inode);

	} else {

		ret = -EFSCORRUPTED;

		EXT4_ERROR_INODE(inode, "bogus i_mode (%o)", inode->i_mode);

		ext4_error_inode(inode, function, line, 0,

				 "iget: bogus i_mode (%o)", inode->i_mode);

		goto bad_inode;

	}

	brelse(iloc.bh);
@@ -5085,13 +5112,6 @@ bad_inode: 
	return ERR_PTR(ret);

}



struct inode *ext4_iget_normal(struct super_block *sb, unsigned long ino)

{

	if (ino < EXT4_FIRST_INO(sb) && ino != EXT4_ROOT_INO)

		return ERR_PTR(-EFSCORRUPTED);

	return ext4_iget(sb, ino);

}



static int ext4_inode_blocks_set(handle_t *handle,

				struct ext4_inode *raw_inode,

				struct ext4_inode_info *ei)
@@ -5380,9 +5400,13 @@ int ext4_write_inode(struct inode *inode, struct writeback_control *wbc) 
{

	int err;



	if (WARN_ON_ONCE(current->flags & PF_MEMALLOC))

	if (WARN_ON_ONCE(current->flags & PF_MEMALLOC) ||

	    sb_rdonly(inode->i_sb))

		return 0;



	if (unlikely(ext4_forced_shutdown(EXT4_SB(inode->i_sb))))

		return -EIO;



	if (EXT4_SB(inode->i_sb)->s_journal) {

		if (ext4_journal_current_handle()) {

			jbd_debug(1, "called recursively, non-PF_MEMALLOC!\n");
@@ -5398,7 +5422,8 @@ int ext4_write_inode(struct inode *inode, struct writeback_control *wbc) 
		if (wbc->sync_mode != WB_SYNC_ALL || wbc->for_sync)

			return 0;



		err = ext4_force_commit(inode->i_sb);

		err = jbd2_complete_transaction(EXT4_SB(inode->i_sb)->s_journal,

						EXT4_I(inode)->i_sync_tid);

	} else {

		struct ext4_iloc iloc;

CRA Git | Maintained and supported by SUSTech CRA and CCSE