* [PATCH 1/2] ext3: init statistics after journal recovery
@ 2010-04-12 11:48 Dmitry Monakhov
2010-04-12 11:48 ` [PATCH 2/2] ext4: " Dmitry Monakhov
0 siblings, 1 reply; 5+ messages in thread
From: Dmitry Monakhov @ 2010-04-12 11:48 UTC (permalink / raw)
To: linux-ext4; +Cc: tytso, Dmitry Monakhov
Currently block/inode/dir counters initialized before journal was
recovered. In fact after journal recovery this info will probably
change. And freeblocks it critical for correct delalloc mode
accounting.
BUG:#15768
Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
---
fs/ext3/super.c | 38 ++++++++++++++++++--------------------
1 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index e844acc..613b5ed 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -1890,21 +1890,6 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
get_random_bytes(&sbi->s_next_generation, sizeof(u32));
spin_lock_init(&sbi->s_next_gen_lock);
- err = percpu_counter_init(&sbi->s_freeblocks_counter,
- ext3_count_free_blocks(sb));
- if (!err) {
- err = percpu_counter_init(&sbi->s_freeinodes_counter,
- ext3_count_free_inodes(sb));
- }
- if (!err) {
- err = percpu_counter_init(&sbi->s_dirs_counter,
- ext3_count_dirs(sb));
- }
- if (err) {
- ext3_msg(sb, KERN_ERR, "error: insufficient memory");
- goto failed_mount3;
- }
-
/* per fileystem reservation list head & lock */
spin_lock_init(&sbi->s_rsv_window_lock);
sbi->s_rsv_window_root = RB_ROOT;
@@ -1945,16 +1930,30 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
if (!test_opt(sb, NOLOAD) &&
EXT3_HAS_COMPAT_FEATURE(sb, EXT3_FEATURE_COMPAT_HAS_JOURNAL)) {
if (ext3_load_journal(sb, es, journal_devnum))
- goto failed_mount3;
+ goto failed_mount2;
} else if (journal_inum) {
if (ext3_create_journal(sb, es, journal_inum))
- goto failed_mount3;
+ goto failed_mount2;
} else {
if (!silent)
ext3_msg(sb, KERN_ERR,
"error: no journal found. "
"mounting ext3 over ext2?");
- goto failed_mount3;
+ goto failed_mount2;
+ }
+ err = percpu_counter_init(&sbi->s_freeblocks_counter,
+ ext3_count_free_blocks(sb));
+ if (!err) {
+ err = percpu_counter_init(&sbi->s_freeinodes_counter,
+ ext3_count_free_inodes(sb));
+ }
+ if (!err) {
+ err = percpu_counter_init(&sbi->s_dirs_counter,
+ ext3_count_dirs(sb));
+ }
+ if (err) {
+ ext3_msg(sb, KERN_ERR, "error: insufficient memory");
+ goto failed_mount4;
}
/* We have now updated the journal if required, so we can
@@ -2040,11 +2039,10 @@ cantfind_ext3:
goto failed_mount;
failed_mount4:
- journal_destroy(sbi->s_journal);
-failed_mount3:
percpu_counter_destroy(&sbi->s_freeblocks_counter);
percpu_counter_destroy(&sbi->s_freeinodes_counter);
percpu_counter_destroy(&sbi->s_dirs_counter);
+ journal_destroy(sbi->s_journal);
failed_mount2:
for (i = 0; i < db_count; i++)
brelse(sbi->s_group_desc[i]);
--
1.6.6.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/2] ext4: init statistics after journal recovery
2010-04-12 11:48 [PATCH 1/2] ext3: init statistics after journal recovery Dmitry Monakhov
@ 2010-04-12 11:48 ` Dmitry Monakhov
0 siblings, 0 replies; 5+ messages in thread
From: Dmitry Monakhov @ 2010-04-12 11:48 UTC (permalink / raw)
To: linux-ext4; +Cc: tytso, Dmitry Monakhov
Currently block/inode/dir counters initialized before journal was
recovered. In fact after journal recovery this info will probably
change. And freeblocks it critical for correct delalloc mode
accounting.
BUG:#15768
Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
---
fs/ext4/super.c | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 29c6875..17cb785 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -2793,24 +2793,6 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
get_random_bytes(&sbi->s_next_generation, sizeof(u32));
spin_lock_init(&sbi->s_next_gen_lock);
- err = percpu_counter_init(&sbi->s_freeblocks_counter,
- ext4_count_free_blocks(sb));
- if (!err) {
- err = percpu_counter_init(&sbi->s_freeinodes_counter,
- ext4_count_free_inodes(sb));
- }
- if (!err) {
- err = percpu_counter_init(&sbi->s_dirs_counter,
- ext4_count_dirs(sb));
- }
- if (!err) {
- err = percpu_counter_init(&sbi->s_dirtyblocks_counter, 0);
- }
- if (err) {
- ext4_msg(sb, KERN_ERR, "insufficient memory");
- goto failed_mount3;
- }
-
sbi->s_stripe = ext4_get_stripe_size(sbi);
sbi->s_max_writeback_mb_bump = 128;
@@ -2859,6 +2841,24 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
goto no_journal;
}
+ err = percpu_counter_init(&sbi->s_freeblocks_counter,
+ ext4_count_free_blocks(sb));
+ if (!err) {
+ err = percpu_counter_init(&sbi->s_freeinodes_counter,
+ ext4_count_free_inodes(sb));
+ }
+ if (!err) {
+ err = percpu_counter_init(&sbi->s_dirs_counter,
+ ext4_count_dirs(sb));
+ }
+ if (!err) {
+ err = percpu_counter_init(&sbi->s_dirtyblocks_counter, 0);
+ }
+ if (err) {
+ ext4_msg(sb, KERN_ERR, "insufficient memory");
+ goto failed_mount_wq;
+ }
+
if (ext4_blocks_count(es) > 0xffffffffULL &&
!jbd2_journal_set_features(EXT4_SB(sb)->s_journal, 0, 0,
JBD2_FEATURE_INCOMPAT_64BIT)) {
@@ -3059,6 +3059,10 @@ failed_mount_wq:
jbd2_journal_destroy(sbi->s_journal);
sbi->s_journal = NULL;
}
+ percpu_counter_destroy(&sbi->s_freeblocks_counter);
+ percpu_counter_destroy(&sbi->s_freeinodes_counter);
+ percpu_counter_destroy(&sbi->s_dirs_counter);
+ percpu_counter_destroy(&sbi->s_dirtyblocks_counter);
failed_mount3:
if (sbi->s_flex_groups) {
if (is_vmalloc_addr(sbi->s_flex_groups))
@@ -3066,10 +3070,6 @@ failed_mount3:
else
kfree(sbi->s_flex_groups);
}
- percpu_counter_destroy(&sbi->s_freeblocks_counter);
- percpu_counter_destroy(&sbi->s_freeinodes_counter);
- percpu_counter_destroy(&sbi->s_dirs_counter);
- percpu_counter_destroy(&sbi->s_dirtyblocks_counter);
failed_mount2:
for (i = 0; i < db_count; i++)
brelse(sbi->s_group_desc[i]);
--
1.6.6.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 1/2] ext3: init statistics after journal recovery
@ 2010-04-12 19:12 Dmitry Monakhov
2010-04-12 19:30 ` Jan Kara
0 siblings, 1 reply; 5+ messages in thread
From: Dmitry Monakhov @ 2010-04-12 19:12 UTC (permalink / raw)
To: linux-ext4; +Cc: tytso, jack, Dmitry Monakhov
Currently block/inode/dir counters initialized before journal was
recovered. In fact after journal recovery this info will probably
change. And freeblocks it critical for correct delalloc mode
accounting.
BUG:#15768
Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
---
fs/ext3/super.c | 38 ++++++++++++++++++--------------------
1 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index e844acc..613b5ed 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -1890,21 +1890,6 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
get_random_bytes(&sbi->s_next_generation, sizeof(u32));
spin_lock_init(&sbi->s_next_gen_lock);
- err = percpu_counter_init(&sbi->s_freeblocks_counter,
- ext3_count_free_blocks(sb));
- if (!err) {
- err = percpu_counter_init(&sbi->s_freeinodes_counter,
- ext3_count_free_inodes(sb));
- }
- if (!err) {
- err = percpu_counter_init(&sbi->s_dirs_counter,
- ext3_count_dirs(sb));
- }
- if (err) {
- ext3_msg(sb, KERN_ERR, "error: insufficient memory");
- goto failed_mount3;
- }
-
/* per fileystem reservation list head & lock */
spin_lock_init(&sbi->s_rsv_window_lock);
sbi->s_rsv_window_root = RB_ROOT;
@@ -1945,16 +1930,30 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
if (!test_opt(sb, NOLOAD) &&
EXT3_HAS_COMPAT_FEATURE(sb, EXT3_FEATURE_COMPAT_HAS_JOURNAL)) {
if (ext3_load_journal(sb, es, journal_devnum))
- goto failed_mount3;
+ goto failed_mount2;
} else if (journal_inum) {
if (ext3_create_journal(sb, es, journal_inum))
- goto failed_mount3;
+ goto failed_mount2;
} else {
if (!silent)
ext3_msg(sb, KERN_ERR,
"error: no journal found. "
"mounting ext3 over ext2?");
- goto failed_mount3;
+ goto failed_mount2;
+ }
+ err = percpu_counter_init(&sbi->s_freeblocks_counter,
+ ext3_count_free_blocks(sb));
+ if (!err) {
+ err = percpu_counter_init(&sbi->s_freeinodes_counter,
+ ext3_count_free_inodes(sb));
+ }
+ if (!err) {
+ err = percpu_counter_init(&sbi->s_dirs_counter,
+ ext3_count_dirs(sb));
+ }
+ if (err) {
+ ext3_msg(sb, KERN_ERR, "error: insufficient memory");
+ goto failed_mount4;
}
/* We have now updated the journal if required, so we can
@@ -2040,11 +2039,10 @@ cantfind_ext3:
goto failed_mount;
failed_mount4:
- journal_destroy(sbi->s_journal);
-failed_mount3:
percpu_counter_destroy(&sbi->s_freeblocks_counter);
percpu_counter_destroy(&sbi->s_freeinodes_counter);
percpu_counter_destroy(&sbi->s_dirs_counter);
+ journal_destroy(sbi->s_journal);
failed_mount2:
for (i = 0; i < db_count; i++)
brelse(sbi->s_group_desc[i]);
--
1.6.6.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 1/2] ext3: init statistics after journal recovery
2010-04-12 19:12 [PATCH 1/2] ext3: " Dmitry Monakhov
@ 2010-04-12 19:30 ` Jan Kara
2010-04-12 19:34 ` Dmitry Monakhov
0 siblings, 1 reply; 5+ messages in thread
From: Jan Kara @ 2010-04-12 19:30 UTC (permalink / raw)
To: Dmitry Monakhov; +Cc: linux-ext4, tytso, jack
On Mon 12-04-10 23:12:55, Dmitry Monakhov wrote:
> Currently block/inode/dir counters initialized before journal was
> recovered. In fact after journal recovery this info will probably
> change. And freeblocks it critical for correct delalloc mode
> accounting.
> BUG:#15768
Thanks for the patch. Could you please also rename failed_mount4
to failed_mount3 so that the label numbering is continguous? Otherwise
the patch is fine.
Honza
> Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
> ---
> fs/ext3/super.c | 38 ++++++++++++++++++--------------------
> 1 files changed, 18 insertions(+), 20 deletions(-)
>
> diff --git a/fs/ext3/super.c b/fs/ext3/super.c
> index e844acc..613b5ed 100644
> --- a/fs/ext3/super.c
> +++ b/fs/ext3/super.c
> @@ -1890,21 +1890,6 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
> get_random_bytes(&sbi->s_next_generation, sizeof(u32));
> spin_lock_init(&sbi->s_next_gen_lock);
>
> - err = percpu_counter_init(&sbi->s_freeblocks_counter,
> - ext3_count_free_blocks(sb));
> - if (!err) {
> - err = percpu_counter_init(&sbi->s_freeinodes_counter,
> - ext3_count_free_inodes(sb));
> - }
> - if (!err) {
> - err = percpu_counter_init(&sbi->s_dirs_counter,
> - ext3_count_dirs(sb));
> - }
> - if (err) {
> - ext3_msg(sb, KERN_ERR, "error: insufficient memory");
> - goto failed_mount3;
> - }
> -
> /* per fileystem reservation list head & lock */
> spin_lock_init(&sbi->s_rsv_window_lock);
> sbi->s_rsv_window_root = RB_ROOT;
> @@ -1945,16 +1930,30 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
> if (!test_opt(sb, NOLOAD) &&
> EXT3_HAS_COMPAT_FEATURE(sb, EXT3_FEATURE_COMPAT_HAS_JOURNAL)) {
> if (ext3_load_journal(sb, es, journal_devnum))
> - goto failed_mount3;
> + goto failed_mount2;
> } else if (journal_inum) {
> if (ext3_create_journal(sb, es, journal_inum))
> - goto failed_mount3;
> + goto failed_mount2;
> } else {
> if (!silent)
> ext3_msg(sb, KERN_ERR,
> "error: no journal found. "
> "mounting ext3 over ext2?");
> - goto failed_mount3;
> + goto failed_mount2;
> + }
> + err = percpu_counter_init(&sbi->s_freeblocks_counter,
> + ext3_count_free_blocks(sb));
> + if (!err) {
> + err = percpu_counter_init(&sbi->s_freeinodes_counter,
> + ext3_count_free_inodes(sb));
> + }
> + if (!err) {
> + err = percpu_counter_init(&sbi->s_dirs_counter,
> + ext3_count_dirs(sb));
> + }
> + if (err) {
> + ext3_msg(sb, KERN_ERR, "error: insufficient memory");
> + goto failed_mount4;
> }
>
> /* We have now updated the journal if required, so we can
> @@ -2040,11 +2039,10 @@ cantfind_ext3:
> goto failed_mount;
>
> failed_mount4:
> - journal_destroy(sbi->s_journal);
> -failed_mount3:
> percpu_counter_destroy(&sbi->s_freeblocks_counter);
> percpu_counter_destroy(&sbi->s_freeinodes_counter);
> percpu_counter_destroy(&sbi->s_dirs_counter);
> + journal_destroy(sbi->s_journal);
> failed_mount2:
> for (i = 0; i < db_count; i++)
> brelse(sbi->s_group_desc[i]);
> --
> 1.6.6.1
>
--
Jan Kara <jack@suse.cz>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 1/2] ext3: init statistics after journal recovery
2010-04-12 19:30 ` Jan Kara
@ 2010-04-12 19:34 ` Dmitry Monakhov
0 siblings, 0 replies; 5+ messages in thread
From: Dmitry Monakhov @ 2010-04-12 19:34 UTC (permalink / raw)
To: Jan Kara; +Cc: linux-ext4, tytso
Jan Kara <jack@suse.cz> writes:
> On Mon 12-04-10 23:12:55, Dmitry Monakhov wrote:
>> Currently block/inode/dir counters initialized before journal was
>> recovered. In fact after journal recovery this info will probably
>> change. And freeblocks it critical for correct delalloc mode
>> accounting.
>> BUG:#15768
> Thanks for the patch. Could you please also rename failed_mount4
> to failed_mount3 so that the label numbering is continguous? Otherwise
> the patch is fine.
Ok, in a minute.
> Honza
>> Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
>> ---
>> fs/ext3/super.c | 38 ++++++++++++++++++--------------------
>> 1 files changed, 18 insertions(+), 20 deletions(-)
>>
>> diff --git a/fs/ext3/super.c b/fs/ext3/super.c
>> index e844acc..613b5ed 100644
>> --- a/fs/ext3/super.c
>> +++ b/fs/ext3/super.c
>> @@ -1890,21 +1890,6 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
>> get_random_bytes(&sbi->s_next_generation, sizeof(u32));
>> spin_lock_init(&sbi->s_next_gen_lock);
>>
>> - err = percpu_counter_init(&sbi->s_freeblocks_counter,
>> - ext3_count_free_blocks(sb));
>> - if (!err) {
>> - err = percpu_counter_init(&sbi->s_freeinodes_counter,
>> - ext3_count_free_inodes(sb));
>> - }
>> - if (!err) {
>> - err = percpu_counter_init(&sbi->s_dirs_counter,
>> - ext3_count_dirs(sb));
>> - }
>> - if (err) {
>> - ext3_msg(sb, KERN_ERR, "error: insufficient memory");
>> - goto failed_mount3;
>> - }
>> -
>> /* per fileystem reservation list head & lock */
>> spin_lock_init(&sbi->s_rsv_window_lock);
>> sbi->s_rsv_window_root = RB_ROOT;
>> @@ -1945,16 +1930,30 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
>> if (!test_opt(sb, NOLOAD) &&
>> EXT3_HAS_COMPAT_FEATURE(sb, EXT3_FEATURE_COMPAT_HAS_JOURNAL)) {
>> if (ext3_load_journal(sb, es, journal_devnum))
>> - goto failed_mount3;
>> + goto failed_mount2;
>> } else if (journal_inum) {
>> if (ext3_create_journal(sb, es, journal_inum))
>> - goto failed_mount3;
>> + goto failed_mount2;
>> } else {
>> if (!silent)
>> ext3_msg(sb, KERN_ERR,
>> "error: no journal found. "
>> "mounting ext3 over ext2?");
>> - goto failed_mount3;
>> + goto failed_mount2;
>> + }
>> + err = percpu_counter_init(&sbi->s_freeblocks_counter,
>> + ext3_count_free_blocks(sb));
>> + if (!err) {
>> + err = percpu_counter_init(&sbi->s_freeinodes_counter,
>> + ext3_count_free_inodes(sb));
>> + }
>> + if (!err) {
>> + err = percpu_counter_init(&sbi->s_dirs_counter,
>> + ext3_count_dirs(sb));
>> + }
>> + if (err) {
>> + ext3_msg(sb, KERN_ERR, "error: insufficient memory");
>> + goto failed_mount4;
>> }
>>
>> /* We have now updated the journal if required, so we can
>> @@ -2040,11 +2039,10 @@ cantfind_ext3:
>> goto failed_mount;
>>
>> failed_mount4:
>> - journal_destroy(sbi->s_journal);
>> -failed_mount3:
>> percpu_counter_destroy(&sbi->s_freeblocks_counter);
>> percpu_counter_destroy(&sbi->s_freeinodes_counter);
>> percpu_counter_destroy(&sbi->s_dirs_counter);
>> + journal_destroy(sbi->s_journal);
>> failed_mount2:
>> for (i = 0; i < db_count; i++)
>> brelse(sbi->s_group_desc[i]);
>> --
>> 1.6.6.1
>>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-04-12 20:05 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-12 11:48 [PATCH 1/2] ext3: init statistics after journal recovery Dmitry Monakhov
2010-04-12 11:48 ` [PATCH 2/2] ext4: " Dmitry Monakhov
-- strict thread matches above, loose matches on Subject: below --
2010-04-12 19:12 [PATCH 1/2] ext3: " Dmitry Monakhov
2010-04-12 19:30 ` Jan Kara
2010-04-12 19:34 ` Dmitry Monakhov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).