Commit 32e8fd2f 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 bugfixes from Ted Ts'o:
 "A set of miscellaneous ext4 bug fixes for 3.18"

* tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: make ext4_ext_convert_to_initialized() return proper number of blocks
  ext4: bail early when clearing inode journal flag fails
  ext4: bail out from make_indexed_dir() on first error
  jbd2: use a better hash function for the revoke table
  ext4: prevent bugon on race between write/fcntl
  ext4: remove extent status procfs files if journal load fails
  ext4: disallow changing journal_csum option during remount
  ext4: enable journal checksum when metadata checksum feature enabled
  ext4: fix oops when loading block bitmap failed
  ext4: fix overflow when updating superblock backups after resize
parents e2488ab6 ae9e9c6a

fs/ext4/extents.c

+4 −5
Original line number Diff line number Diff line
@@ -3603,11 +3603,10 @@ static int ext4_ext_convert_to_initialized(handle_t *handle, 
		}

	}



	allocated = ext4_split_extent(handle, inode, ppath,

				      &split_map, split_flag, flags);

	if (allocated < 0)

		err = allocated;



	err = ext4_split_extent(handle, inode, ppath, &split_map, split_flag,

				flags);

	if (err > 0)

		err = 0;

out:

	/* If we have gotten a failure, don't zero out status tree */

	if (!err)

fs/ext4/file.c

+1 −1
Original line number Diff line number Diff line
@@ -137,10 +137,10 @@ ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from) 
			iov_iter_truncate(from, sbi->s_bitmap_maxbytes - pos);

	}



	iocb->private = &overwrite;

	if (o_direct) {

		blk_start_plug(&plug);



		iocb->private = &overwrite;



		/* check whether we do a DIO overwrite or not */

		if (ext4_should_dioread_nolock(inode) && !aio_mutex &&

fs/ext4/ialloc.c

+4 −0
Original line number Diff line number Diff line
@@ -887,6 +887,10 @@ got: 
		struct buffer_head *block_bitmap_bh;



		block_bitmap_bh = ext4_read_block_bitmap(sb, group);

		if (!block_bitmap_bh) {

			err = -EIO;

			goto out;

		}

		BUFFER_TRACE(block_bitmap_bh, "get block bitmap access");

		err = ext4_journal_get_write_access(handle, block_bitmap_bh);

		if (err) {

fs/ext4/inode.c

+6 −1
Original line number Diff line number Diff line
@@ -4959,7 +4959,12 @@ int ext4_change_inode_journal_flag(struct inode *inode, int val) 
	if (val)

		ext4_set_inode_flag(inode, EXT4_INODE_JOURNAL_DATA);

	else {

		jbd2_journal_flush(journal);

		err = jbd2_journal_flush(journal);

		if (err < 0) {

			jbd2_journal_unlock_updates(journal);

			ext4_inode_resume_unlocked_dio(inode);

			return err;

		}

		ext4_clear_inode_flag(inode, EXT4_INODE_JOURNAL_DATA);

	}

	ext4_set_aops(inode);

fs/ext4/namei.c

+18 −10
Original line number Diff line number Diff line
@@ -1816,17 +1816,31 @@ static int make_indexed_dir(handle_t *handle, struct dentry *dentry, 
		hinfo.hash_version += EXT4_SB(dir->i_sb)->s_hash_unsigned;

	hinfo.seed = EXT4_SB(dir->i_sb)->s_hash_seed;

	ext4fs_dirhash(name, namelen, &hinfo);

	memset(frames, 0, sizeof(frames));

	frame = frames;

	frame->entries = entries;

	frame->at = entries;

	frame->bh = bh;

	bh = bh2;



	ext4_handle_dirty_dx_node(handle, dir, frame->bh);

	ext4_handle_dirty_dirent_node(handle, dir, bh);

	retval = ext4_handle_dirty_dx_node(handle, dir, frame->bh);

	if (retval)

		goto out_frames;	

	retval = ext4_handle_dirty_dirent_node(handle, dir, bh);

	if (retval)

		goto out_frames;	



	de = do_split(handle,dir, &bh, frame, &hinfo);

	if (IS_ERR(de)) {

		retval = PTR_ERR(de);

		goto out_frames;

	}

	dx_release(frames);



	retval = add_dirent_to_buf(handle, dentry, inode, de, bh);

	brelse(bh);

	return retval;

out_frames:

	/*

	 * Even if the block split failed, we have to properly write

	 * out all the changes we did so far. Otherwise we can end up
@@ -1834,12 +1848,6 @@ static int make_indexed_dir(handle_t *handle, struct dentry *dentry, 
	 */

	ext4_mark_inode_dirty(handle, dir);

	dx_release(frames);

		return PTR_ERR(de);

	}

	dx_release(frames);



	retval = add_dirent_to_buf(handle, dentry, inode, de, bh);

	brelse(bh);

	return retval;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE