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

Commit fd4f35d0 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 more ext4 bugfixes from Ted Ts'o:
 "A number of miscellaneous ext4 bugs fixes for v3.11, including a fix
  so that if ext4 is built as a module, to allow it to be unloaded"

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: flush the extent status cache during EXT4_IOC_SWAP_BOOT
  ext4: fix mount/remount error messages for incompatible mount options
  ext4: allow the mount options nodelalloc and data=journal
parents 27822558 cde2d7a7

fs/ext4/ioctl.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -77,8 +77,10 @@ static void swap_inode_data(struct inode *inode1, struct inode *inode2) 
	memswap(ei1->i_data, ei2->i_data, sizeof(ei1->i_data));

	memswap(ei1->i_data, ei2->i_data, sizeof(ei1->i_data));

	memswap(&ei1->i_flags, &ei2->i_flags, sizeof(ei1->i_flags));

	memswap(&ei1->i_flags, &ei2->i_flags, sizeof(ei1->i_flags));

	memswap(&ei1->i_disksize, &ei2->i_disksize, sizeof(ei1->i_disksize));

	memswap(&ei1->i_disksize, &ei2->i_disksize, sizeof(ei1->i_disksize));

	memswap(&ei1->i_es_tree, &ei2->i_es_tree, sizeof(ei1->i_es_tree));

	ext4_es_remove_extent(inode1, 0, EXT_MAX_BLOCKS);

	memswap(&ei1->i_es_lru_nr, &ei2->i_es_lru_nr, sizeof(ei1->i_es_lru_nr));

	ext4_es_remove_extent(inode2, 0, EXT_MAX_BLOCKS);

	ext4_es_lru_del(inode1);

	ext4_es_lru_del(inode2);





	isize = i_size_read(inode1);

	isize = i_size_read(inode1);

	i_size_write(inode1, i_size_read(inode2));

	i_size_write(inode1, i_size_read(inode2));

fs/ext4/super.c

+17 −2
Original line number Original line Diff line number Diff line
@@ -1359,7 +1359,7 @@ static const struct mount_opts { 
	{Opt_delalloc, EXT4_MOUNT_DELALLOC,

	{Opt_delalloc, EXT4_MOUNT_DELALLOC,

	 MOPT_EXT4_ONLY | MOPT_SET | MOPT_EXPLICIT},

	 MOPT_EXT4_ONLY | MOPT_SET | MOPT_EXPLICIT},

	{Opt_nodelalloc, EXT4_MOUNT_DELALLOC,

	{Opt_nodelalloc, EXT4_MOUNT_DELALLOC,

	 MOPT_EXT4_ONLY | MOPT_CLEAR | MOPT_EXPLICIT},

	 MOPT_EXT4_ONLY | MOPT_CLEAR},

	{Opt_journal_checksum, EXT4_MOUNT_JOURNAL_CHECKSUM,

	{Opt_journal_checksum, EXT4_MOUNT_JOURNAL_CHECKSUM,

	 MOPT_EXT4_ONLY | MOPT_SET},

	 MOPT_EXT4_ONLY | MOPT_SET},

	{Opt_journal_async_commit, (EXT4_MOUNT_JOURNAL_ASYNC_COMMIT |

	{Opt_journal_async_commit, (EXT4_MOUNT_JOURNAL_ASYNC_COMMIT |
@@ -3483,7 +3483,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) 
		}

		}

		if (test_opt(sb, DIOREAD_NOLOCK)) {

		if (test_opt(sb, DIOREAD_NOLOCK)) {

			ext4_msg(sb, KERN_ERR, "can't mount with "

			ext4_msg(sb, KERN_ERR, "can't mount with "

				 "both data=journal and delalloc");

				 "both data=journal and dioread_nolock");

			goto failed_mount;

			goto failed_mount;

		}

		}

		if (test_opt(sb, DELALLOC))

		if (test_opt(sb, DELALLOC))
@@ -4727,6 +4727,21 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) 
		goto restore_opts;

		goto restore_opts;

	}

	}





	if (test_opt(sb, DATA_FLAGS) == EXT4_MOUNT_JOURNAL_DATA) {

		if (test_opt2(sb, EXPLICIT_DELALLOC)) {

			ext4_msg(sb, KERN_ERR, "can't mount with "

				 "both data=journal and delalloc");

			err = -EINVAL;

			goto restore_opts;

		}

		if (test_opt(sb, DIOREAD_NOLOCK)) {

			ext4_msg(sb, KERN_ERR, "can't mount with "

				 "both data=journal and dioread_nolock");

			err = -EINVAL;

			goto restore_opts;

		}

	}



	if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED)

	if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED)

		ext4_abort(sb, "Abort forced by user");

		ext4_abort(sb, "Abort forced by user");