Commit 8e099d1e 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:
 "Bug fixes and clean ups for the 3.17 merge window"

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: fix ext4_discard_allocated_blocks() if we can't allocate the pa struct
  ext4: fix COLLAPSE RANGE test for bigalloc file systems
  ext4: check inline directory before converting
  ext4: fix incorrect locking in move_extent_per_page
  ext4: use correct depth value
  ext4: add i_data_sem sanity check
  ext4: fix wrong size computation in ext4_mb_normalize_request()
  ext4: make ext4_has_inline_data() as a inline function
  ext4: remove readpage() check in ext4_mmap_file()
  ext4: fix punch hole on files with indirect mapping
  ext4: remove metadata reservation checks
  ext4: rearrange initialization to fix EXT4FS_DEBUG
parents b54ecfb7 86f0afd4

fs/ext4/balloc.c

+0 −1
Original line number Diff line number Diff line
@@ -639,7 +639,6 @@ ext4_fsblk_t ext4_new_meta_blocks(handle_t *handle, struct inode *inode, 
	if (!(*errp) &&

	    ext4_test_inode_state(inode, EXT4_STATE_DELALLOC_RESERVED)) {

		spin_lock(&EXT4_I(inode)->i_block_reservation_lock);

		EXT4_I(inode)->i_allocated_meta_blocks += ar.len;

		spin_unlock(&EXT4_I(inode)->i_block_reservation_lock);

		dquot_alloc_block_nofail(inode,

				EXT4_C2B(EXT4_SB(inode->i_sb), ar.len));

fs/ext4/dir.c

+25 −0
Original line number Diff line number Diff line
@@ -571,6 +571,31 @@ static int ext4_release_dir(struct inode *inode, struct file *filp) 
	return 0;

}



int ext4_check_all_de(struct inode *dir, struct buffer_head *bh, void *buf,

		      int buf_size)

{

	struct ext4_dir_entry_2 *de;

	int nlen, rlen;

	unsigned int offset = 0;

	char *top;



	de = (struct ext4_dir_entry_2 *)buf;

	top = buf + buf_size;

	while ((char *) de < top) {

		if (ext4_check_dir_entry(dir, NULL, de, bh,

					 buf, buf_size, offset))

			return -EIO;

		nlen = EXT4_DIR_REC_LEN(de->name_len);

		rlen = ext4_rec_len_from_disk(de->rec_len, buf_size);

		de = (struct ext4_dir_entry_2 *)((char *)de + rlen);

		offset += rlen;

	}

	if ((char *) de > top)

		return -EIO;



	return 0;

}



const struct file_operations ext4_dir_operations = {

	.llseek		= ext4_dir_llseek,

	.read		= generic_read_dir,

fs/ext4/ext4.h

+10 −4
Original line number Diff line number Diff line
@@ -591,7 +591,6 @@ enum { 
#define EXT4_FREE_BLOCKS_NO_QUOT_UPDATE	0x0008

#define EXT4_FREE_BLOCKS_NOFREE_FIRST_CLUSTER	0x0010

#define EXT4_FREE_BLOCKS_NOFREE_LAST_CLUSTER	0x0020

#define EXT4_FREE_BLOCKS_RESERVE		0x0040



/*

 * ioctl commands
@@ -2029,6 +2028,8 @@ static inline unsigned char get_dtype(struct super_block *sb, int filetype) 


	return ext4_filetype_table[filetype];

}

extern int ext4_check_all_de(struct inode *dir, struct buffer_head *bh,

			     void *buf, int buf_size);



/* fsync.c */

extern int ext4_sync_file(struct file *, loff_t, loff_t, int);
@@ -2144,8 +2145,8 @@ extern ssize_t ext4_ind_direct_IO(int rw, struct kiocb *iocb, 
extern int ext4_ind_calc_metadata_amount(struct inode *inode, sector_t lblock);

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

extern void ext4_ind_truncate(handle_t *, struct inode *inode);

extern int ext4_free_hole_blocks(handle_t *handle, struct inode *inode,

				 ext4_lblk_t first, ext4_lblk_t stop);

extern int ext4_ind_remove_space(handle_t *handle, struct inode *inode,

				 ext4_lblk_t start, ext4_lblk_t end);



/* ioctl.c */

extern long ext4_ioctl(struct file *, unsigned int, unsigned long);
@@ -2560,7 +2561,6 @@ extern const struct file_operations ext4_file_operations; 
extern loff_t ext4_llseek(struct file *file, loff_t offset, int origin);



/* inline.c */

extern int ext4_has_inline_data(struct inode *inode);

extern int ext4_get_max_inline_size(struct inode *inode);

extern int ext4_find_inline_data_nolock(struct inode *inode);

extern int ext4_init_inline_data(handle_t *handle, struct inode *inode,
@@ -2626,6 +2626,12 @@ extern void ext4_inline_data_truncate(struct inode *inode, int *has_inline); 


extern int ext4_convert_inline_data(struct inode *inode);



static inline int ext4_has_inline_data(struct inode *inode)

{

	return ext4_test_inode_flag(inode, EXT4_INODE_INLINE_DATA) &&

	       EXT4_I(inode)->i_inline_off;

}



/* namei.c */

extern const struct inode_operations ext4_dir_inode_operations;

extern const struct inode_operations ext4_special_inode_operations;

fs/ext4/extents.c

+6 −8
Original line number Diff line number Diff line
@@ -161,6 +161,8 @@ int __ext4_ext_dirty(const char *where, unsigned int line, handle_t *handle, 
		     struct inode *inode, struct ext4_ext_path *path)

{

	int err;



	WARN_ON(!rwsem_is_locked(&EXT4_I(inode)->i_data_sem));

	if (path->p_bh) {

		ext4_extent_block_csum_set(inode, ext_block_hdr(path->p_bh));

		/* path points to block */
@@ -1808,8 +1810,7 @@ static void ext4_ext_try_to_merge_up(handle_t *handle, 


	brelse(path[1].p_bh);

	ext4_free_blocks(handle, inode, NULL, blk, 1,

			 EXT4_FREE_BLOCKS_METADATA | EXT4_FREE_BLOCKS_FORGET |

			 EXT4_FREE_BLOCKS_RESERVE);

			 EXT4_FREE_BLOCKS_METADATA | EXT4_FREE_BLOCKS_FORGET);

}



/*
@@ -3253,7 +3254,7 @@ out: 


fix_extent_len:

	ex->ee_len = orig_ex.ee_len;

	ext4_ext_dirty(handle, inode, path + depth);

	ext4_ext_dirty(handle, inode, path + path->p_depth);

	return err;

}
@@ -5403,16 +5404,13 @@ int ext4_collapse_range(struct inode *inode, loff_t offset, loff_t len) 
	int ret;



	/* Collapse range works only on fs block size aligned offsets. */

	if (offset & (EXT4_BLOCK_SIZE(sb) - 1) ||

	    len & (EXT4_BLOCK_SIZE(sb) - 1))

	if (offset & (EXT4_CLUSTER_SIZE(sb) - 1) ||

	    len & (EXT4_CLUSTER_SIZE(sb) - 1))

		return -EINVAL;



	if (!S_ISREG(inode->i_mode))

		return -EINVAL;



	if (EXT4_SB(inode->i_sb)->s_cluster_ratio > 1)

		return -EOPNOTSUPP;



	trace_ext4_collapse_range(inode, offset, len);



	punch_start = offset >> EXT4_BLOCK_SIZE_BITS(sb);

fs/ext4/file.c

+0 −4
Original line number Diff line number Diff line
@@ -200,10 +200,6 @@ static const struct vm_operations_struct ext4_file_vm_ops = { 


static int ext4_file_mmap(struct file *file, struct vm_area_struct *vma)

{

	struct address_space *mapping = file->f_mapping;



	if (!mapping->a_ops->readpage)

		return -ENOEXEC;

	file_accessed(file);

	vma->vm_ops = &ext4_file_vm_ops;

	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE