ocfs2: Change bg_chain check for ocfs2_validate_gd_parent.
PATCH 1/1 ocfs2: Change bg_chain check for ocfs2_validate_gd_parent.
In ocfs2_validate_gd_parent, we check bg_chain against the cl_next_free_rec of the dinode. Actually in resize, we have the chance of bg_chain == cl_next_free_rec. So add some additional condition check for it.
I also rename paramter "clean_error" to "resize", since the old one is not clearly enough to indicate that we should only meet with this case in resize.
btw, the correpsonding bug is
http://oss.oracle.com/bugzilla/show_bug.cgi?id=1230.
--- fs/ocfs2/suballoc.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-)
fs/ocfs2/suballoc.c +8 -5
@@ -152,7 +152,7 @@ static u32 ocfs2_bits_per_group(struct ocfs2_chain_list *cl)#define do_error (fmt, ...) \ do{ \ - if (clean_error) \ + if (resize) \ mlog(ML_ERROR, fmt "\n", ##__VA_ARGS__); \ else \ ocfs2_error(sb, fmt, ##__VA_ARGS__); \
@@ -160,7 +160,7 @@ static u32 ocfs2_bits_per_group(struct ocfs2_chain_list *cl)static int ocfs2_validate_gd_self (struct super_block *sb,struct buffer_head *bh, -int clean_error) +int resize) {struct ocfs2_group_desc *gd = (struct ocfs2_group_desc *)bh->b_data;
@@ -211,7 +211,7 @@ static int ocfs2_validate_gd_self(struct super_block *sb,static int ocfs2_validate_gd_parent (struct super_block *sb,struct ocfs2_dinode *di,struct buffer_head *bh, -int clean_error) +int resize) {unsigned int max_bits;struct ocfs2_group_desc *gd = (struct ocfs2_group_desc *)bh->b_data;
@@ -233,8 +233,11 @@ static int ocfs2_validate_gd_parent(struct super_block *sb,return -EINVAL ; } -if (le16_to_cpu (gd->bg_chain) >= -le16_to_cpu (di->id2.i_chain.cl_next_free_rec)) { +/* In resize, we may meet the case bg_chain == cl_next_free_rec. */ +if ((le16_to_cpu (gd->bg_chain) > +le16_to_cpu (di->id2.i_chain.cl_next_free_rec)) || + ((le16_to_cpu (gd->bg_chain) == +le16_to_cpu (di->id2.i_chain.cl_next_free_rec)) && !resize)) {do_error ("Group descriptor #%llu has bad chain %u" , (unsigned long long )bh->b_blocknr,le16_to_cpu (gd->bg_chain));
Signature · 1 line
1.6.3.3.334.g916e1.dirty
PATCH 1/1 ocfs2: Change bg_chain check for ocfs2_validate_gd_parent.
Quoted 5 lines · Tao Ma
In
ocfs2_validate_gd_parent, we checkbg_chainagainst thecl_next_free_recof the dinode. Actually in resize, we have the chance ofbg_chain==cl_next_free_rec. So add some additional condition check for it.
Quoted 8 lines
I also rename paramter "
clean_error" to "resize", since the old one is not clearly enough to indicate that we should only meet with this case in resize.btw, the correpsonding bug is
http://oss.oracle.com/bugzilla/show_bug.cgi?id=1230.Signed-off-by Tao Ma <[email protected]>
This patch is now in the fixes branch of ocfs2.git.
Joel
Signature · 9 lines
"When choosing between two evils, I always like to try the one
I've never tried before."
- Mae West
Joel Becker
Principal Software Developer
Oracle
E-mail: joel.becker at oracle.com
Phone: (650) 506-8127