diff mbox

ext4: Reject mount an ext2 filesystem with journal options

Message ID 1435334609-23192-1-git-send-email-cmaiolino@redhat.com
State Accepted, archived
Headers show

Commit Message

Carlos Maiolino June 26, 2015, 4:03 p.m. UTC
There is no reason to allow ext2 filesystems be mounted with journal mount
options. So, this patch adds them to the MOPT_NO_EXT2 mount options list.

Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
---
 fs/ext4/super.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Carlos Maiolino July 20, 2015, 12:19 p.m. UTC | #1
ping

On Fri, Jun 26, 2015 at 01:03:29PM -0300, Carlos Maiolino wrote:
> There is no reason to allow ext2 filesystems be mounted with journal mount
> options. So, this patch adds them to the MOPT_NO_EXT2 mount options list.
> 
> Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
> ---
>  fs/ext4/super.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/fs/ext4/super.c b/fs/ext4/super.c
> index f06d058..e4b1141 100644
> --- a/fs/ext4/super.c
> +++ b/fs/ext4/super.c
> @@ -1366,9 +1366,9 @@ static const struct mount_opts {
>  	{Opt_stripe, 0, MOPT_GTE0},
>  	{Opt_resuid, 0, MOPT_GTE0},
>  	{Opt_resgid, 0, MOPT_GTE0},
> -	{Opt_journal_dev, 0, MOPT_GTE0},
> -	{Opt_journal_path, 0, MOPT_STRING},
> -	{Opt_journal_ioprio, 0, MOPT_GTE0},
> +	{Opt_journal_dev, 0, MOPT_NO_EXT2 | MOPT_GTE0},
> +	{Opt_journal_path, 0, MOPT_NO_EXT2 | MOPT_STRING},
> +	{Opt_journal_ioprio, 0, MOPT_NO_EXT2 | MOPT_GTE0},
>  	{Opt_data_journal, EXT4_MOUNT_JOURNAL_DATA, MOPT_NO_EXT2 | MOPT_DATAJ},
>  	{Opt_data_ordered, EXT4_MOUNT_ORDERED_DATA, MOPT_NO_EXT2 | MOPT_DATAJ},
>  	{Opt_data_writeback, EXT4_MOUNT_WRITEBACK_DATA,
> -- 
> 2.1.0
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
Theodore Ts'o July 22, 2015, 3:58 a.m. UTC | #2
On Fri, Jun 26, 2015 at 01:03:29PM -0300, Carlos Maiolino wrote:
> There is no reason to allow ext2 filesystems be mounted with journal mount
> options. So, this patch adds them to the MOPT_NO_EXT2 mount options list.
> 
> Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>

Applied, thanks.

					- Ted
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index f06d058..e4b1141 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1366,9 +1366,9 @@  static const struct mount_opts {
 	{Opt_stripe, 0, MOPT_GTE0},
 	{Opt_resuid, 0, MOPT_GTE0},
 	{Opt_resgid, 0, MOPT_GTE0},
-	{Opt_journal_dev, 0, MOPT_GTE0},
-	{Opt_journal_path, 0, MOPT_STRING},
-	{Opt_journal_ioprio, 0, MOPT_GTE0},
+	{Opt_journal_dev, 0, MOPT_NO_EXT2 | MOPT_GTE0},
+	{Opt_journal_path, 0, MOPT_NO_EXT2 | MOPT_STRING},
+	{Opt_journal_ioprio, 0, MOPT_NO_EXT2 | MOPT_GTE0},
 	{Opt_data_journal, EXT4_MOUNT_JOURNAL_DATA, MOPT_NO_EXT2 | MOPT_DATAJ},
 	{Opt_data_ordered, EXT4_MOUNT_ORDERED_DATA, MOPT_NO_EXT2 | MOPT_DATAJ},
 	{Opt_data_writeback, EXT4_MOUNT_WRITEBACK_DATA,