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

Commit 6ae6514b authored by Piotr Sarna's avatar Piotr Sarna Committed by Theodore Ts'o
Browse files

ext4: fix mount/remount error messages for incompatible mount options 



Commit 56889787 ("ext4: improve handling of conflicting mount options")
introduced incorrect messages shown while choosing wrong mount options.

First of all, both cases of incorrect mount options,
"data=journal,delalloc" and "data=journal,dioread_nolock" result in
the same error message.

Secondly, the problem above isn't solved for remount option: the
mismatched parameter is simply ignored.  Moreover, ext4_msg states
that remount with options "data=journal,delalloc" succeeded, which is
not true.

To fix it up, I added a simple check after parse_options() call to
ensure that data=journal and delalloc/dioread_nolock parameters are
not present at the same time.

Signed-off-by: default avatarPiotr Sarna <p.sarna@partner.samsung.com>
Acked-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
Cc: stable@vger.kernel.org
parent 59d9fa5c

fs/ext4/super.c

+16 −1
Original line number Original line Diff line number Diff line
@@ -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");