diff options
| author | Curt Wohlgemuth <curtw@google.com> | 2010-05-16 12:00:00 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2010-05-16 12:00:00 -0400 |
| commit | d4c402d9fd97a54bb7ed89f9e9869897eb4f6e1f (patch) | |
| tree | 6469b5d8aa9e18db0d689f79ab8e40ae5ff3064d /fs/ext4 | |
| parent | 72b8ab9dde211ea518ff27e631b2046ef90c29a2 (diff) | |
| download | linux-3.10-d4c402d9fd97a54bb7ed89f9e9869897eb4f6e1f.tar.gz linux-3.10-d4c402d9fd97a54bb7ed89f9e9869897eb4f6e1f.tar.bz2 linux-3.10-d4c402d9fd97a54bb7ed89f9e9869897eb4f6e1f.zip | |
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: Curt Wohlgemuth <curtw@google.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/super.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index d83cdcbd9b3..8e655f5acb3 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -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 @@ no_journal: } 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 @@ out_fail: 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 @@ restore_opts: #endif unlock_super(sb); unlock_kernel(); + kfree(orig_data); return err; } |