Commit 1dbfae01 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:
 "Convert ext4 to use the new mount API, and add support for the
  FS_IOC_GETFSLABEL and FS_IOC_SETFSLABEL ioctls.

  In addition the usual large number of clean ups and bug fixes, in
  particular for the fast_commit feature"

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (48 commits)
  ext4: don't use the orphan list when migrating an inode
  ext4: use BUG_ON instead of if condition followed by BUG
  ext4: fix a copy and paste typo
  ext4: set csum seed in tmp inode while migrating to extents
  ext4: remove unnecessary 'offset' assignment
  ext4: remove redundant o_start statement
  ext4: drop an always true check
  ext4: remove unused assignments
  ext4: remove redundant statement
  ext4: remove useless resetting io_end_size in mpage_process_page()
  ext4: allow to change s_last_trim_minblks via sysfs
  ext4: change s_last_trim_minblks type to unsigned long
  ext4: implement support for get/set fs label
  ext4: only set EXT4_MOUNT_QUOTA when journalled quota file is specified
  ext4: don't use kfree() on rcu protected pointer sbi->s_qf_names
  ext4: avoid trim error on fs with small groups
  ext4: fix an use-after-free issue about data=journal writeback mode
  ext4: fix null-ptr-deref in '__ext4_journal_ensure_credits'
  ext4: initialize err_blk before calling __ext4_get_inode_loc
  ext4: fix a possible ABBA deadlock due to busy PA
  ...
parents 11fc88c2 6eeaf88f

fs/ext4/acl.c

+0 −2
Original line number Diff line number Diff line
@@ -246,7 +246,6 @@ ext4_set_acl(struct user_namespace *mnt_userns, struct inode *inode, 
	handle = ext4_journal_start(inode, EXT4_HT_XATTR, credits);

	if (IS_ERR(handle))

		return PTR_ERR(handle);

	ext4_fc_start_update(inode);



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

		error = posix_acl_update_mode(mnt_userns, inode, &mode, &acl);
@@ -264,7 +263,6 @@ ext4_set_acl(struct user_namespace *mnt_userns, struct inode *inode, 
	}

out_stop:

	ext4_journal_stop(handle);

	ext4_fc_stop_update(inode);

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

		goto retry;

	return error;

fs/ext4/dir.c

+0 −1
Original line number Diff line number Diff line
@@ -303,7 +303,6 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx) 
			goto done;

		brelse(bh);

		bh = NULL;

		offset = 0;

	}

done:

	err = 0;

fs/ext4/ext4.h

+13 −9
Original line number Diff line number Diff line
@@ -1298,6 +1298,8 @@ extern void ext4_set_bits(void *bm, int cur, int len); 
/* Metadata checksum algorithm codes */

#define EXT4_CRC32C_CHKSUM		1



#define EXT4_LABEL_MAX			16



/*

 * Structure of the super block

 */
@@ -1347,7 +1349,7 @@ struct ext4_super_block { 
/*60*/	__le32	s_feature_incompat;	/* incompatible feature set */

	__le32	s_feature_ro_compat;	/* readonly-compatible feature set */

/*68*/	__u8	s_uuid[16];		/* 128-bit uuid for volume */

/*78*/	char	s_volume_name[16];	/* volume name */

/*78*/	char	s_volume_name[EXT4_LABEL_MAX];	/* volume name */

/*88*/	char	s_last_mounted[64] __nonstring;	/* directory where last mounted */

/*C8*/	__le32	s_algorithm_usage_bitmap; /* For compression */

	/*
@@ -1661,7 +1663,7 @@ struct ext4_sb_info { 
	struct task_struct *s_mmp_tsk;



	/* record the last minlen when FITRIM is called. */

	atomic_t s_last_trim_minblks;

	unsigned long s_last_trim_minblks;



	/* Reference to checksum algorithm driver via cryptoapi */

	struct crypto_shash *s_chksum_driver;
@@ -1725,9 +1727,9 @@ struct ext4_sb_info { 
	 */

	struct work_struct s_error_work;



	/* Ext4 fast commit stuff */

	/* Ext4 fast commit sub transaction ID */

	atomic_t s_fc_subtid;

	atomic_t s_fc_ineligible_updates;



	/*

	 * After commit starts, the main queue gets locked, and the further

	 * updates get added in the staging queue.
@@ -1747,7 +1749,6 @@ struct ext4_sb_info { 
	spinlock_t s_fc_lock;

	struct buffer_head *s_fc_bh;

	struct ext4_fc_stats s_fc_stats;

	u64 s_fc_avg_commit_time;

#ifdef CONFIG_EXT4_DEBUG

	int s_fc_debug_max_replay;

#endif
@@ -2399,8 +2400,7 @@ ext4_rec_len_from_disk(__le16 dlen, unsigned blocksize) 


static inline __le16 ext4_rec_len_to_disk(unsigned len, unsigned blocksize)

{

	if ((len > blocksize) || (blocksize > (1 << 18)) || (len & 3))

		BUG();

	BUG_ON((len > blocksize) || (blocksize > (1 << 18)) || (len & 3));

#if (PAGE_SIZE >= 65536)

	if (len < 65536)

		return cpu_to_le16(len);
@@ -2926,8 +2926,6 @@ void __ext4_fc_track_create(handle_t *handle, struct inode *inode, 
void ext4_fc_track_create(handle_t *handle, struct dentry *dentry);

void ext4_fc_track_inode(handle_t *handle, struct inode *inode);

void ext4_fc_mark_ineligible(struct super_block *sb, int reason);

void ext4_fc_start_ineligible(struct super_block *sb, int reason);

void ext4_fc_stop_ineligible(struct super_block *sb);

void ext4_fc_start_update(struct inode *inode);

void ext4_fc_stop_update(struct inode *inode);

void ext4_fc_del(struct inode *inode);
@@ -2935,6 +2933,7 @@ bool ext4_fc_replay_check_excluded(struct super_block *sb, ext4_fsblk_t block); 
void ext4_fc_replay_cleanup(struct super_block *sb);

int ext4_fc_commit(journal_t *journal, tid_t commit_tid);

int __init ext4_fc_init_dentry_cache(void);

void ext4_fc_destroy_dentry_cache(void);



/* mballoc.c */

extern const struct seq_operations ext4_mb_seq_groups_ops;
@@ -3096,6 +3095,9 @@ 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);

extern unsigned int ext4_list_backups(struct super_block *sb,

				      unsigned int *three, unsigned int *five,

				      unsigned int *seven);



/* super.c */

extern struct buffer_head *ext4_sb_bread(struct super_block *sb,
@@ -3110,6 +3112,8 @@ extern int ext4_read_bh_lock(struct buffer_head *bh, int op_flags, bool wait); 
extern void ext4_sb_breadahead_unmovable(struct super_block *sb, sector_t block);

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

extern int ext4_calculate_overhead(struct super_block *sb);

extern __le32 ext4_superblock_csum(struct super_block *sb,

				   struct ext4_super_block *es);

extern void ext4_superblock_csum_set(struct super_block *sb);

extern int ext4_alloc_flex_bg_array(struct super_block *sb,

				    ext4_group_t ngroup);

fs/ext4/ext4_jbd2.c

+2 −0
Original line number Diff line number Diff line
@@ -162,6 +162,8 @@ int __ext4_journal_ensure_credits(handle_t *handle, int check_cred, 
{

	if (!ext4_handle_valid(handle))

		return 0;

	if (is_handle_aborted(handle))

		return -EROFS;

	if (jbd2_handle_buffer_credits(handle) >= check_cred &&

	    handle->h_revoke_credits >= revoke_cred)

		return 0;

fs/ext4/extents.c

+3 −13
Original line number Diff line number Diff line
@@ -1496,8 +1496,7 @@ static int ext4_ext_search_left(struct inode *inode, 
				EXT4_ERROR_INODE(inode,

				  "ix (%d) != EXT_FIRST_INDEX (%d) (depth %d)!",

				  ix != NULL ? le32_to_cpu(ix->ei_block) : 0,

				  EXT_FIRST_INDEX(path[depth].p_hdr) != NULL ?

		le32_to_cpu(EXT_FIRST_INDEX(path[depth].p_hdr)->ei_block) : 0,

				  le32_to_cpu(EXT_FIRST_INDEX(path[depth].p_hdr)->ei_block),

				  depth);

				return -EFSCORRUPTED;

			}
@@ -2025,7 +2024,6 @@ int ext4_ext_insert_extent(handle_t *handle, struct inode *inode, 
					+ ext4_ext_get_actual_len(newext));

			if (unwritten)

				ext4_ext_mark_unwritten(ex);

			eh = path[depth].p_hdr;

			nearex = ex;

			goto merge;

		}
@@ -2054,7 +2052,6 @@ int ext4_ext_insert_extent(handle_t *handle, struct inode *inode, 
					+ ext4_ext_get_actual_len(newext));

			if (unwritten)

				ext4_ext_mark_unwritten(ex);

			eh = path[depth].p_hdr;

			nearex = ex;

			goto merge;

		}
@@ -4647,8 +4644,6 @@ static long ext4_zero_range(struct file *file, loff_t offset, 
	ret = ext4_mark_inode_dirty(handle, inode);

	if (unlikely(ret))

		goto out_handle;

	ext4_fc_track_range(handle, inode, offset >> inode->i_sb->s_blocksize_bits,

			(offset + len - 1) >> inode->i_sb->s_blocksize_bits);

	/* Zero out partial block at the edges of the range */

	ret = ext4_zero_partial_blocks(handle, inode, offset, len);

	if (ret >= 0)
@@ -4697,8 +4692,6 @@ long ext4_fallocate(struct file *file, int mode, loff_t offset, loff_t len) 
		     FALLOC_FL_INSERT_RANGE))

		return -EOPNOTSUPP;



	ext4_fc_start_update(inode);



	if (mode & FALLOC_FL_PUNCH_HOLE) {

		ret = ext4_punch_hole(inode, offset, len);

		goto exit;
@@ -4762,7 +4755,6 @@ long ext4_fallocate(struct file *file, int mode, loff_t offset, loff_t len) 
	inode_unlock(inode);

	trace_ext4_fallocate_exit(inode, offset, max_blocks, ret);

exit:

	ext4_fc_stop_update(inode);

	return ret;

}
@@ -5344,7 +5336,7 @@ static int ext4_collapse_range(struct inode *inode, loff_t offset, loff_t len) 
		ret = PTR_ERR(handle);

		goto out_mmap;

	}

	ext4_fc_start_ineligible(sb, EXT4_FC_REASON_FALLOC_RANGE);

	ext4_fc_mark_ineligible(sb, EXT4_FC_REASON_FALLOC_RANGE);



	down_write(&EXT4_I(inode)->i_data_sem);

	ext4_discard_preallocations(inode, 0);
@@ -5383,7 +5375,6 @@ static int ext4_collapse_range(struct inode *inode, loff_t offset, loff_t len) 


out_stop:

	ext4_journal_stop(handle);

	ext4_fc_stop_ineligible(sb);

out_mmap:

	filemap_invalidate_unlock(mapping);

out_mutex:
@@ -5485,7 +5476,7 @@ static int ext4_insert_range(struct inode *inode, loff_t offset, loff_t len) 
		ret = PTR_ERR(handle);

		goto out_mmap;

	}

	ext4_fc_start_ineligible(sb, EXT4_FC_REASON_FALLOC_RANGE);

	ext4_fc_mark_ineligible(sb, EXT4_FC_REASON_FALLOC_RANGE);



	/* Expand file to avoid data loss if there is error while shifting */

	inode->i_size += len;
@@ -5560,7 +5551,6 @@ static int ext4_insert_range(struct inode *inode, loff_t offset, loff_t len) 


out_stop:

	ext4_journal_stop(handle);

	ext4_fc_stop_ineligible(sb);

out_mmap:

	filemap_invalidate_unlock(mapping);

out_mutex: