diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-15 04:51:40 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-15 04:51:40 -0500 |
| commit | f055408957750cf759162c364c2a4dfe19765844 (patch) | |
| tree | aecc0a13c582d310902e6fa95d8853c627828fcc /fs/ext2 | |
| parent | 83cbd33aae2c3cd14f80a8abf733033a57aa4923 (diff) | |
| parent | 4060994c3e337b40e0f6fa8ce2cc178e021baf3d (diff) | |
Merge branch 'master'
Diffstat (limited to 'fs/ext2')
| -rw-r--r-- | fs/ext2/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext2/super.c b/fs/ext2/super.c index e4ed4b31a433..522fa70dd8ea 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c | |||
| @@ -881,7 +881,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) | |||
| 881 | } | 881 | } |
| 882 | if (EXT2_HAS_COMPAT_FEATURE(sb, EXT3_FEATURE_COMPAT_HAS_JOURNAL)) | 882 | if (EXT2_HAS_COMPAT_FEATURE(sb, EXT3_FEATURE_COMPAT_HAS_JOURNAL)) |
| 883 | ext2_warning(sb, __FUNCTION__, | 883 | ext2_warning(sb, __FUNCTION__, |
| 884 | "mounting ext3 filesystem as ext2\n"); | 884 | "mounting ext3 filesystem as ext2"); |
| 885 | ext2_setup_super (sb, es, sb->s_flags & MS_RDONLY); | 885 | ext2_setup_super (sb, es, sb->s_flags & MS_RDONLY); |
| 886 | percpu_counter_mod(&sbi->s_freeblocks_counter, | 886 | percpu_counter_mod(&sbi->s_freeblocks_counter, |
| 887 | ext2_count_free_blocks(sb)); | 887 | ext2_count_free_blocks(sb)); |