* [PATCH 1/2] ext4: remove unused buddy_loaded in ext4_mb_seq_groups_show
@ 2024-01-17 11:52 yangerkun
2024-01-17 11:52 ` [PATCH 2/2] ext4: distinguish different error " yangerkun
2024-01-17 12:56 ` [PATCH 1/2] ext4: remove unused buddy_loaded " Jan Kara
0 siblings, 2 replies; 5+ messages in thread
From: yangerkun @ 2024-01-17 11:52 UTC (permalink / raw)
To: tytso, adilger.kernel, jack; +Cc: linux-ext4, yangerkun, yangerkun
We can just first call ext4_mb_unload_buddy, then copy information from
ext4_group_info. So remove this unused value.
Signed-off-by: yangerkun <yangerkun@huawei.com>
---
fs/ext4/mballoc.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index f44f668e407f..139f232bdbb5 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -2990,8 +2990,7 @@ static int ext4_mb_seq_groups_show(struct seq_file *seq, void *v)
{
struct super_block *sb = pde_data(file_inode(seq->file));
ext4_group_t group = (ext4_group_t) ((unsigned long) v);
- int i;
- int err, buddy_loaded = 0;
+ int i, err;
struct ext4_buddy e4b;
struct ext4_group_info *grinfo;
unsigned char blocksize_bits = min_t(unsigned char,
@@ -3021,14 +3020,10 @@ static int ext4_mb_seq_groups_show(struct seq_file *seq, void *v)
seq_printf(seq, "#%-5u: I/O error\n", group);
return 0;
}
- buddy_loaded = 1;
+ ext4_mb_unload_buddy(&e4b);
}
memcpy(&sg, grinfo, i);
-
- if (buddy_loaded)
- ext4_mb_unload_buddy(&e4b);
-
seq_printf(seq, "#%-5u: %-5u %-5u %-5u [", group, sg.info.bb_free,
sg.info.bb_fragments, sg.info.bb_first_free);
for (i = 0; i <= 13; i++)
--
2.39.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] ext4: distinguish different error in ext4_mb_seq_groups_show
2024-01-17 11:52 [PATCH 1/2] ext4: remove unused buddy_loaded in ext4_mb_seq_groups_show yangerkun
@ 2024-01-17 11:52 ` yangerkun
2024-01-17 12:58 ` Jan Kara
2024-01-17 12:56 ` [PATCH 1/2] ext4: remove unused buddy_loaded " Jan Kara
1 sibling, 1 reply; 5+ messages in thread
From: yangerkun @ 2024-01-17 11:52 UTC (permalink / raw)
To: tytso, adilger.kernel, jack; +Cc: linux-ext4, yangerkun, yangerkun
While cat mb_groups for a mounted ext4 image which has some corrupted
group, the string return to userspace was just "I/O error" which confuse
me a lot. Use ext4_decode_error to help distinguish different error.
Signed-off-by: yangerkun <yangerkun@huawei.com>
---
fs/ext4/mballoc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 139f232bdbb5..77d6113e2822 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -2991,6 +2991,7 @@ static int ext4_mb_seq_groups_show(struct seq_file *seq, void *v)
struct super_block *sb = pde_data(file_inode(seq->file));
ext4_group_t group = (ext4_group_t) ((unsigned long) v);
int i, err;
+ char nbuf[16];
struct ext4_buddy e4b;
struct ext4_group_info *grinfo;
unsigned char blocksize_bits = min_t(unsigned char,
@@ -3017,7 +3018,7 @@ static int ext4_mb_seq_groups_show(struct seq_file *seq, void *v)
if (unlikely(EXT4_MB_GRP_NEED_INIT(grinfo))) {
err = ext4_mb_load_buddy(sb, group, &e4b);
if (err) {
- seq_printf(seq, "#%-5u: I/O error\n", group);
+ seq_printf(seq, "#%-5u: %s\n", group, ext4_decode_error(NULL, err, nbuf));
return 0;
}
ext4_mb_unload_buddy(&e4b);
--
2.39.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] ext4: remove unused buddy_loaded in ext4_mb_seq_groups_show
2024-01-17 11:52 [PATCH 1/2] ext4: remove unused buddy_loaded in ext4_mb_seq_groups_show yangerkun
2024-01-17 11:52 ` [PATCH 2/2] ext4: distinguish different error " yangerkun
@ 2024-01-17 12:56 ` Jan Kara
2024-01-18 4:22 ` yangerkun
1 sibling, 1 reply; 5+ messages in thread
From: Jan Kara @ 2024-01-17 12:56 UTC (permalink / raw)
To: yangerkun; +Cc: tytso, adilger.kernel, jack, linux-ext4, yangerkun
On Wed 17-01-24 19:52:22, yangerkun wrote:
> We can just first call ext4_mb_unload_buddy, then copy information from
> ext4_group_info. So remove this unused value.
>
> Signed-off-by: yangerkun <yangerkun@huawei.com>
Looks good. Feel free to add:
Reviewed-by: Jan Kara <jack@suse.cz>
Although I'd prefer if you add a comment before memcpy() like:
/*
* We care only about free space counters in the group info and
* these are safe to access even after the buddy has been unloaded
*/
Honza
> ---
> fs/ext4/mballoc.c | 9 ++-------
> 1 file changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
> index f44f668e407f..139f232bdbb5 100644
> --- a/fs/ext4/mballoc.c
> +++ b/fs/ext4/mballoc.c
> @@ -2990,8 +2990,7 @@ static int ext4_mb_seq_groups_show(struct seq_file *seq, void *v)
> {
> struct super_block *sb = pde_data(file_inode(seq->file));
> ext4_group_t group = (ext4_group_t) ((unsigned long) v);
> - int i;
> - int err, buddy_loaded = 0;
> + int i, err;
> struct ext4_buddy e4b;
> struct ext4_group_info *grinfo;
> unsigned char blocksize_bits = min_t(unsigned char,
> @@ -3021,14 +3020,10 @@ static int ext4_mb_seq_groups_show(struct seq_file *seq, void *v)
> seq_printf(seq, "#%-5u: I/O error\n", group);
> return 0;
> }
> - buddy_loaded = 1;
> + ext4_mb_unload_buddy(&e4b);
> }
>
> memcpy(&sg, grinfo, i);
> -
> - if (buddy_loaded)
> - ext4_mb_unload_buddy(&e4b);
> -
> seq_printf(seq, "#%-5u: %-5u %-5u %-5u [", group, sg.info.bb_free,
> sg.info.bb_fragments, sg.info.bb_first_free);
> for (i = 0; i <= 13; i++)
> --
> 2.39.2
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] ext4: distinguish different error in ext4_mb_seq_groups_show
2024-01-17 11:52 ` [PATCH 2/2] ext4: distinguish different error " yangerkun
@ 2024-01-17 12:58 ` Jan Kara
0 siblings, 0 replies; 5+ messages in thread
From: Jan Kara @ 2024-01-17 12:58 UTC (permalink / raw)
To: yangerkun; +Cc: tytso, adilger.kernel, jack, linux-ext4, yangerkun
On Wed 17-01-24 19:52:23, yangerkun wrote:
> While cat mb_groups for a mounted ext4 image which has some corrupted
> group, the string return to userspace was just "I/O error" which confuse
> me a lot. Use ext4_decode_error to help distinguish different error.
>
> Signed-off-by: yangerkun <yangerkun@huawei.com>
I guess this is an improvement :). Feel free to add:
Reviewed-by: Jan Kara <jack@suse.cz>
Honza
> ---
> fs/ext4/mballoc.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
> index 139f232bdbb5..77d6113e2822 100644
> --- a/fs/ext4/mballoc.c
> +++ b/fs/ext4/mballoc.c
> @@ -2991,6 +2991,7 @@ static int ext4_mb_seq_groups_show(struct seq_file *seq, void *v)
> struct super_block *sb = pde_data(file_inode(seq->file));
> ext4_group_t group = (ext4_group_t) ((unsigned long) v);
> int i, err;
> + char nbuf[16];
> struct ext4_buddy e4b;
> struct ext4_group_info *grinfo;
> unsigned char blocksize_bits = min_t(unsigned char,
> @@ -3017,7 +3018,7 @@ static int ext4_mb_seq_groups_show(struct seq_file *seq, void *v)
> if (unlikely(EXT4_MB_GRP_NEED_INIT(grinfo))) {
> err = ext4_mb_load_buddy(sb, group, &e4b);
> if (err) {
> - seq_printf(seq, "#%-5u: I/O error\n", group);
> + seq_printf(seq, "#%-5u: %s\n", group, ext4_decode_error(NULL, err, nbuf));
> return 0;
> }
> ext4_mb_unload_buddy(&e4b);
> --
> 2.39.2
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] ext4: remove unused buddy_loaded in ext4_mb_seq_groups_show
2024-01-17 12:56 ` [PATCH 1/2] ext4: remove unused buddy_loaded " Jan Kara
@ 2024-01-18 4:22 ` yangerkun
0 siblings, 0 replies; 5+ messages in thread
From: yangerkun @ 2024-01-18 4:22 UTC (permalink / raw)
To: Jan Kara, yangerkun; +Cc: tytso, adilger.kernel, linux-ext4
在 2024/1/17 20:56, Jan Kara 写道:
> On Wed 17-01-24 19:52:22, yangerkun wrote:
>> We can just first call ext4_mb_unload_buddy, then copy information from
>> ext4_group_info. So remove this unused value.
>>
>> Signed-off-by: yangerkun <yangerkun@huawei.com>
>
> Looks good. Feel free to add:
>
> Reviewed-by: Jan Kara <jack@suse.cz>
>
> Although I'd prefer if you add a comment before memcpy() like:
>
> /*
> * We care only about free space counters in the group info and
> * these are safe to access even after the buddy has been unloaded
> */
>
> Honza
>
Thanks a lot for your review! I will do it next version!
>> ---
>> fs/ext4/mballoc.c | 9 ++-------
>> 1 file changed, 2 insertions(+), 7 deletions(-)
>>
>> diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
>> index f44f668e407f..139f232bdbb5 100644
>> --- a/fs/ext4/mballoc.c
>> +++ b/fs/ext4/mballoc.c
>> @@ -2990,8 +2990,7 @@ static int ext4_mb_seq_groups_show(struct seq_file *seq, void *v)
>> {
>> struct super_block *sb = pde_data(file_inode(seq->file));
>> ext4_group_t group = (ext4_group_t) ((unsigned long) v);
>> - int i;
>> - int err, buddy_loaded = 0;
>> + int i, err;
>> struct ext4_buddy e4b;
>> struct ext4_group_info *grinfo;
>> unsigned char blocksize_bits = min_t(unsigned char,
>> @@ -3021,14 +3020,10 @@ static int ext4_mb_seq_groups_show(struct seq_file *seq, void *v)
>> seq_printf(seq, "#%-5u: I/O error\n", group);
>> return 0;
>> }
>> - buddy_loaded = 1;
>> + ext4_mb_unload_buddy(&e4b);
>> }
>>
>> memcpy(&sg, grinfo, i);
>> -
>> - if (buddy_loaded)
>> - ext4_mb_unload_buddy(&e4b);
>> -
>> seq_printf(seq, "#%-5u: %-5u %-5u %-5u [", group, sg.info.bb_free,
>> sg.info.bb_fragments, sg.info.bb_first_free);
>> for (i = 0; i <= 13; i++)
>> --
>> 2.39.2
>>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-01-18 4:22 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-17 11:52 [PATCH 1/2] ext4: remove unused buddy_loaded in ext4_mb_seq_groups_show yangerkun
2024-01-17 11:52 ` [PATCH 2/2] ext4: distinguish different error " yangerkun
2024-01-17 12:58 ` Jan Kara
2024-01-17 12:56 ` [PATCH 1/2] ext4: remove unused buddy_loaded " Jan Kara
2024-01-18 4:22 ` yangerkun
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).