diff options
author | Steve French <sfrench@us.ibm.com> | 2005-11-13 23:28:58 -0500 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2005-11-13 23:28:58 -0500 |
commit | 7b0a65f9923ffe7885a5473648baaa3a1a701726 (patch) | |
tree | b9be4a0504b4e637b86bdc92d88268ff57ea1bc5 /fs/ext2 | |
parent | 1b98a8221e3c9c86ae7e292ba7542d2dd6f10eb9 (diff) | |
parent | ee90f62b3e69d0cd9f8edc6b95f07b1a8c38aaf4 (diff) |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 e4ed4b31a4..522fa70dd8 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)); |