Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ocfs2: Set ac_last_group properly with discontig group.

Browse source 
ac_last_group is used to record the last block group we
used during allocation. But the initialization process
only calls ocfs2_which_suballoc_group and fails to
use suballoc_loc properly. So let us do it.
Another function ocfs2_test_suballoc_bit also needs fix.

I have searched all the callers of ocfs2_which_suballoc_group,
and all the callers notices suballoc_loc now.

Signed-off-by: Tao Ma <tao.ma@oracle.com>
This commit is contained in:
Tao Ma 2010-04-27 08:30:36 +08:00
parent 74380c479a
commit abf1b3cb5b
1 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
fs/ocfs2/suballoc.c
View file

@ -1982,10 +1982,10 @@ int ocfs2_claim_metadata(handle_t *handle,
} }
static void ocfs2_init_inode_ac_group(struct inode *dir, static void ocfs2_init_inode_ac_group(struct inode *dir,
struct buffer_head *parent_fe_bh, struct buffer_head *parent_di_bh,
struct ocfs2_alloc_context *ac) struct ocfs2_alloc_context *ac)
{ {
struct ocfs2_dinode *fe = (struct ocfs2_dinode *)parent_fe_bh->b_data; struct ocfs2_dinode *di = (struct ocfs2_dinode *)parent_di_bh->b_data;
/* /*
* Try to allocate inodes from some specific group. * Try to allocate inodes from some specific group.
* *
@ -1999,10 +1999,14 @@ static void ocfs2_init_inode_ac_group(struct inode *dir,
if (OCFS2_I(dir)->ip_last_used_group && if (OCFS2_I(dir)->ip_last_used_group &&
OCFS2_I(dir)->ip_last_used_slot == ac->ac_alloc_slot) OCFS2_I(dir)->ip_last_used_slot == ac->ac_alloc_slot)
ac->ac_last_group = OCFS2_I(dir)->ip_last_used_group; ac->ac_last_group = OCFS2_I(dir)->ip_last_used_group;
else if (le16_to_cpu(fe->i_suballoc_slot) == ac->ac_alloc_slot) else if (le16_to_cpu(di->i_suballoc_slot) == ac->ac_alloc_slot) {
ac->ac_last_group = ocfs2_which_suballoc_group( if (di->i_suballoc_loc)
le64_to_cpu(fe->i_blkno), ac->ac_last_group = le64_to_cpu(di->i_suballoc_loc);
le16_to_cpu(fe->i_suballoc_bit)); else
ac->ac_last_group = ocfs2_which_suballoc_group(
le64_to_cpu(di->i_blkno),
le16_to_cpu(di->i_suballoc_bit));
}
} }
static inline void ocfs2_save_inode_ac_group(struct inode *dir, static inline void ocfs2_save_inode_ac_group(struct inode *dir,
@ -2620,7 +2624,7 @@ static int ocfs2_test_suballoc_bit(struct ocfs2_super *osb,
struct buffer_head *alloc_bh, u64 blkno, struct buffer_head *alloc_bh, u64 blkno,
u16 bit, int *res) u16 bit, int *res)
{ {
struct ocfs2_dinode *alloc_fe; struct ocfs2_dinode *alloc_di;
struct ocfs2_group_desc *group; struct ocfs2_group_desc *group;
struct buffer_head *group_bh = NULL; struct buffer_head *group_bh = NULL;
u64 bg_blkno; u64 bg_blkno;
@ -2629,17 +2633,20 @@ static int ocfs2_test_suballoc_bit(struct ocfs2_super *osb,
mlog_entry("blkno: %llu bit: %u\n", (unsigned long long)blkno, mlog_entry("blkno: %llu bit: %u\n", (unsigned long long)blkno,
(unsigned int)bit); (unsigned int)bit);
alloc_fe = (struct ocfs2_dinode *)alloc_bh->b_data; alloc_di = (struct ocfs2_dinode *)alloc_bh->b_data;
if ((bit + 1) > ocfs2_bits_per_group(&alloc_fe->id2.i_chain)) { if ((bit + 1) > ocfs2_bits_per_group(&alloc_di->id2.i_chain)) {
mlog(ML_ERROR, "suballoc bit %u out of range of %u\n", mlog(ML_ERROR, "suballoc bit %u out of range of %u\n",
(unsigned int)bit, (unsigned int)bit,
ocfs2_bits_per_group(&alloc_fe->id2.i_chain)); ocfs2_bits_per_group(&alloc_di->id2.i_chain));
status = -EINVAL; status = -EINVAL;
goto bail; goto bail;
} }
bg_blkno = ocfs2_which_suballoc_group(blkno, bit); if (alloc_di->i_suballoc_loc)
status = ocfs2_read_group_descriptor(suballoc, alloc_fe, bg_blkno, bg_blkno = le64_to_cpu(alloc_di->i_suballoc_loc);
else
bg_blkno = ocfs2_which_suballoc_group(blkno, bit);
status = ocfs2_read_group_descriptor(suballoc, alloc_di, bg_blkno,
&group_bh); &group_bh);
if (status < 0) { if (status < 0) {
mlog(ML_ERROR, "read group %llu failed %d\n", mlog(ML_ERROR, "read group %llu failed %d\n",