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

Commit dd727dad 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:

 - add GETFSMAP support

 - some performance improvements for very large file systems and for
   random write workloads into a preallocated file

 - bug fixes and cleanups.

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  jbd2: cleanup write flags handling from jbd2_write_superblock()
  ext4: mark superblock writes synchronous for nobarrier mounts
  ext4: inherit encryption xattr before other xattrs
  ext4: replace BUG_ON with WARN_ONCE in ext4_end_bio()
  ext4: avoid unnecessary transaction stalls during writeback
  ext4: preload block group descriptors
  ext4: make ext4_shutdown() static
  ext4: support GETFSMAP ioctls
  vfs: add common GETFSMAP ioctl definitions
  ext4: evict inline data when writing to memory map
  ext4: remove ext4_xattr_check_entry()
  ext4: rename ext4_xattr_check_names() to ext4_xattr_check_entries()
  ext4: merge ext4_xattr_list() into ext4_listxattr()
  ext4: constify static data that is never modified
  ext4: trim return value and 'dir' argument from ext4_insert_dentry()
  jbd2: fix dbench4 performance regression for 'nobarrier' mounts
  jbd2: Fix lockdep splat with generic/270 test
  mm: retry writepages() on ENOMEM when doing an data integrity writeback
parents 13e09881 17f423b5

fs/ext4/Makefile

+5 −5
Original line number Diff line number Diff line
@@ -4,11 +4,11 @@ 


obj-$(CONFIG_EXT4_FS) += ext4.o



ext4-y	:= balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o page-io.o \

		ioctl.o namei.o super.o symlink.o hash.o resize.o extents.o \

		ext4_jbd2.o migrate.o mballoc.o block_validity.o move_extent.o \

		mmp.o indirect.o extents_status.o xattr.o xattr_user.o \

		xattr_trusted.o inline.o readpage.o sysfs.o

ext4-y	:= balloc.o bitmap.o block_validity.o dir.o ext4_jbd2.o extents.o \

		extents_status.o file.o fsmap.o fsync.o hash.o ialloc.o \

		indirect.o inline.o inode.o ioctl.o mballoc.o migrate.o \

		mmp.o move_extent.o namei.o page-io.o readpage.o resize.o \

		super.o symlink.o sysfs.o xattr.o xattr_trusted.o xattr_user.o



ext4-$(CONFIG_EXT4_FS_POSIX_ACL)	+= acl.o

ext4-$(CONFIG_EXT4_FS_SECURITY)		+= xattr_security.o

fs/ext4/ext4.h

+6 −7
Original line number Diff line number Diff line
@@ -2356,8 +2356,7 @@ extern int ext4_find_dest_de(struct inode *dir, struct inode *inode, 
			     void *buf, int buf_size,

			     struct ext4_filename *fname,

			     struct ext4_dir_entry_2 **dest_de);

int ext4_insert_dentry(struct inode *dir,

		       struct inode *inode,

void ext4_insert_dentry(struct inode *inode,

			struct ext4_dir_entry_2 *de,

			int buf_size,

			struct ext4_filename *fname);
@@ -2366,7 +2365,7 @@ static inline void ext4_update_dx_flag(struct inode *inode) 
	if (!ext4_has_feature_dir_index(inode->i_sb))

		ext4_clear_inode_flag(inode, EXT4_INODE_INDEX);

}

static unsigned char ext4_filetype_table[] = {

static const unsigned char ext4_filetype_table[] = {

	DT_UNKNOWN, DT_REG, DT_DIR, DT_CHR, DT_BLK, DT_FIFO, DT_SOCK, DT_LNK

};
@@ -3050,7 +3049,7 @@ extern int ext4_handle_dirty_dirent_node(handle_t *handle, 
					 struct inode *inode,

					 struct buffer_head *bh);

#define S_SHIFT 12

static unsigned char ext4_type_by_mode[S_IFMT >> S_SHIFT] = {

static const unsigned char ext4_type_by_mode[S_IFMT >> S_SHIFT] = {

	[S_IFREG >> S_SHIFT]	= EXT4_FT_REG_FILE,

	[S_IFDIR >> S_SHIFT]	= EXT4_FT_DIR,

	[S_IFCHR >> S_SHIFT]	= EXT4_FT_CHRDEV,

fs/ext4/fsmap.c

0 → 100644
+722 −0

File added.

Preview size limit exceeded, changes collapsed.

fs/ext4/fsmap.h

0 → 100644
+69 −0

File added.

Preview size limit exceeded, changes collapsed.

fs/ext4/ialloc.c

+11 −6
Original line number Diff line number Diff line
@@ -1098,6 +1098,17 @@ struct inode *__ext4_new_inode(handle_t *handle, struct inode *dir, 
	if (err)

		goto fail_drop;



	/*

	 * Since the encryption xattr will always be unique, create it first so

	 * that it's less likely to end up in an external xattr block and

	 * prevent its deduplication.

	 */

	if (encrypt) {

		err = fscrypt_inherit_context(dir, inode, handle, true);

		if (err)

			goto fail_free_drop;

	}



	err = ext4_init_acl(handle, inode, dir);

	if (err)

		goto fail_free_drop;
@@ -1119,12 +1130,6 @@ struct inode *__ext4_new_inode(handle_t *handle, struct inode *dir, 
		ei->i_datasync_tid = handle->h_transaction->t_tid;

	}



	if (encrypt) {

		err = fscrypt_inherit_context(dir, inode, handle, true);

		if (err)

			goto fail_free_drop;

	}



	err = ext4_mark_inode_dirty(handle, inode);

	if (err) {

		ext4_std_error(sb, err);