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

Commit 0e01df10 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:
 "Fix a number of bugs, most notably a potential stale data exposure
  after a crash and a potential BUG_ON crash if a file has the data
  journalling flag enabled while it has dirty delayed allocation blocks
  that haven't been written yet.  Also fix a potential crash in the new
  project quota code and a maliciously corrupted file system.

  In addition, fix some DAX-specific bugs, including when there is a
  transient ENOSPC situation and races between writes via direct I/O and
  an mmap'ed segment that could lead to lost I/O.

  Finally the usual set of miscellaneous cleanups"

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (23 commits)
  ext4: pre-zero allocated blocks for DAX IO
  ext4: refactor direct IO code
  ext4: fix race in transient ENOSPC detection
  ext4: handle transient ENOSPC properly for DAX
  dax: call get_blocks() with create == 1 for write faults to unwritten extents
  ext4: remove unmeetable inconsisteny check from ext4_find_extent()
  jbd2: remove excess descriptions for handle_s
  ext4: remove unnecessary bio get/put
  ext4: silence UBSAN in ext4_mb_init()
  ext4: address UBSAN warning in mb_find_order_for_block()
  ext4: fix oops on corrupted filesystem
  ext4: fix check of dqget() return value in ext4_ioctl_setproject()
  ext4: clean up error handling when orphan list is corrupted
  ext4: fix hang when processing corrupted orphaned inode list
  ext4: remove trailing \n from ext4_warning/ext4_error calls
  ext4: fix races between changing inode journal mode and ext4_writepages
  ext4: handle unwritten or delalloc buffers before enabling data journaling
  ext4: fix jbd2 handle extension in ext4_ext_truncate_extend_restart()
  ext4: do not ask jbd2 to write data for delalloc buffers
  jbd2: add support for avoiding data writes during transaction commits
  ...
parents a56f4895 12735f88

fs/compat.c

+4 −0
Original line number Diff line number Diff line
@@ -936,6 +936,8 @@ static int compat_filldir(struct dir_context *ctx, const char *name, int namlen, 
	}

	dirent = buf->previous;

	if (dirent) {

		if (signal_pending(current))

			return -EINTR;

		if (__put_user(offset, &dirent->d_off))

			goto efault;

	}
@@ -1020,6 +1022,8 @@ static int compat_filldir64(struct dir_context *ctx, const char *name, 
	dirent = buf->previous;



	if (dirent) {

		if (signal_pending(current))

			return -EINTR;

		if (__put_user_unaligned(offset, &dirent->d_off))

			goto efault;

	}

fs/dax.c

+1 −1
Original line number Diff line number Diff line
@@ -676,7 +676,7 @@ int __dax_fault(struct vm_area_struct *vma, struct vm_fault *vmf, 
	if (error)

		goto unlock_page;



	if (!buffer_mapped(&bh) && !buffer_unwritten(&bh) && !vmf->cow_page) {

	if (!buffer_mapped(&bh) && !vmf->cow_page) {

		if (vmf->flags & FAULT_FLAG_WRITE) {

			error = get_block(inode, block, &bh, 1);

			count_vm_event(PGMAJFAULT);

fs/ext4/balloc.c

+2 −1
Original line number Diff line number Diff line
@@ -610,7 +610,8 @@ int ext4_should_retry_alloc(struct super_block *sb, int *retries) 


	jbd_debug(1, "%s: retrying operation after ENOSPC\n", sb->s_id);



	return jbd2_journal_force_commit_nested(EXT4_SB(sb)->s_journal);

	jbd2_journal_force_commit_nested(EXT4_SB(sb)->s_journal);

	return 1;

}



/*

fs/ext4/dir.c

+5 −0
Original line number Diff line number Diff line
@@ -150,6 +150,11 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx) 
	while (ctx->pos < inode->i_size) {

		struct ext4_map_blocks map;



		if (fatal_signal_pending(current)) {

			err = -ERESTARTSYS;

			goto errout;

		}

		cond_resched();

		map.m_lblk = ctx->pos >> EXT4_BLOCK_SIZE_BITS(sb);

		map.m_len = 1;

		err = ext4_map_blocks(NULL, inode, &map, 0);

fs/ext4/ext4.h

+16 −4
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <linux/ratelimit.h>

#include <crypto/hash.h>

#include <linux/falloc.h>

#include <linux/percpu-rwsem.h>

#ifdef __KERNEL__

#include <linux/compat.h>

#endif
@@ -581,6 +582,9 @@ enum { 
#define EXT4_GET_BLOCKS_ZERO			0x0200

#define EXT4_GET_BLOCKS_CREATE_ZERO		(EXT4_GET_BLOCKS_CREATE |\

					EXT4_GET_BLOCKS_ZERO)

	/* Caller will submit data before dropping transaction handle. This

	 * allows jbd2 to avoid submitting data before commit. */

#define EXT4_GET_BLOCKS_IO_SUBMIT		0x0400



/*

 * The bit position of these flags must not overlap with any of the
@@ -1505,6 +1509,9 @@ struct ext4_sb_info { 
	struct ratelimit_state s_err_ratelimit_state;

	struct ratelimit_state s_warning_ratelimit_state;

	struct ratelimit_state s_msg_ratelimit_state;



	/* Barrier between changing inodes' journal flags and writepages ops. */

	struct percpu_rw_semaphore s_journal_flag_rwsem;

};



static inline struct ext4_sb_info *EXT4_SB(struct super_block *sb)
@@ -1549,7 +1556,6 @@ enum { 
	EXT4_STATE_DIOREAD_LOCK,	/* Disable support for dio read

					   nolocking */

	EXT4_STATE_MAY_INLINE_DATA,	/* may have in-inode data */

	EXT4_STATE_ORDERED_MODE,	/* data=ordered mode */

	EXT4_STATE_EXT_PRECACHED,	/* extents have been precached */

};
@@ -2521,7 +2527,7 @@ 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_get_block_unwritten(struct inode *inode, sector_t iblock,

			     struct buffer_head *bh_result, int create);

int ext4_dax_mmap_get_block(struct inode *inode, sector_t iblock,

int ext4_dax_get_block(struct inode *inode, sector_t iblock,

		       struct buffer_head *bh_result, int create);

int ext4_get_block(struct inode *inode, sector_t iblock,

		   struct buffer_head *bh_result, int create);
@@ -2581,7 +2587,6 @@ extern int ext4_get_next_extent(struct inode *inode, ext4_lblk_t lblk, 
/* indirect.c */

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

				struct ext4_map_blocks *map, int flags);

extern ssize_t ext4_ind_direct_IO(struct kiocb *iocb, struct iov_iter *iter);

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);
@@ -3329,6 +3334,13 @@ static inline void ext4_clear_io_unwritten_flag(ext4_io_end_t *io_end) 
	}

}



static inline bool ext4_aligned_io(struct inode *inode, loff_t off, loff_t len)

{

	int blksize = 1 << inode->i_blkbits;



	return IS_ALIGNED(off, blksize) && IS_ALIGNED(len, blksize);

}



#endif	/* __KERNEL__ */



#define EFSBADCRC	EBADMSG		/* Bad CRC detected */