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

Commit d4c402d9 authored by Curt Wohlgemuth's avatar Curt Wohlgemuth Committed by Theodore Ts'o
Browse files

ext4: Print mount options in when mounting and add a remount message 



This adds a "re-mounted" message to ext4_remount(), and both it and
the mount message in ext4_fill_super() now have the original mount
options data string.

Signed-off-by: default avatarCurt Wohlgemuth <curtw@google.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 72b8ab9d

fs/ext4/super.c

+10 −1
Original line number Diff line number Diff line
@@ -2431,6 +2431,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) 
				__releases(kernel_lock)

				__acquires(kernel_lock)

{

	char *orig_data = kstrdup(data, GFP_KERNEL);

	struct buffer_head *bh;

	struct ext4_super_block *es = NULL;

	struct ext4_sb_info *sbi;
@@ -3037,9 +3038,11 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) 
	} else

		descr = "out journal";



	ext4_msg(sb, KERN_INFO, "mounted filesystem with%s", descr);

	ext4_msg(sb, KERN_INFO, "mounted filesystem with%s. "

		"Opts: %s", descr, orig_data);



	lock_kernel();

	kfree(orig_data);

	return 0;



cantfind_ext4:
@@ -3086,6 +3089,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) 
	kfree(sbi->s_blockgroup_lock);

	kfree(sbi);

	lock_kernel();

	kfree(orig_data);

	return ret;

}
@@ -3576,6 +3580,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) 
#ifdef CONFIG_QUOTA

	int i;

#endif

	char *orig_data = kstrdup(data, GFP_KERNEL);



	lock_kernel();
@@ -3709,6 +3714,9 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) 
#endif

	unlock_super(sb);

	unlock_kernel();



	ext4_msg(sb, KERN_INFO, "re-mounted. Opts: %s", orig_data);

	kfree(orig_data);

	return 0;



restore_opts:
@@ -3730,6 +3738,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) 
#endif

	unlock_super(sb);

	unlock_kernel();

	kfree(orig_data);

	return err;

}