lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ocfs2: properly set and use inode group alloc hint

Browse Source 
We were setting ac->ac_last_group in ocfs2_claim_suballoc_bits from
res->sr_bg_blkno.  Unfortunately, res->sr_bg_blkno is going to be zero under
normal (non-fragmented) circumstances. The discontig block group patches
effectively turned off that feature. Fix this by correctly calculating what
the next group hint should be.

Acked-by: Tao Ma <tao.ma@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Tested-by: Goldwyn Rodrigues <rgoldwyn@suse.de>
Signed-off-by: Tao Ma <tao.ma@oracle.com>
This commit is contained in:
Mark Fasheh
2010-08-26 13:06:50 -07:00
committed by Tao Ma
parent 889f004a8c
commit b2b6ebf5f7
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
fs/ocfs2/suballoc.c
View File

@@ -62,6 +62,17 @@ struct ocfs2_suballoc_result {
unsigned int sr_bits; /* How many bits we claimed */ unsigned int sr_bits; /* How many bits we claimed */
}; };
static u64 ocfs2_group_from_res(struct ocfs2_suballoc_result *res)
{
if (res->sr_blkno == 0)
return 0;
if (res->sr_bg_blkno)
return res->sr_bg_blkno;
return ocfs2_which_suballoc_group(res->sr_blkno, res->sr_bit_offset);
}
static inline void ocfs2_debug_bg(struct ocfs2_group_desc *bg); static inline void ocfs2_debug_bg(struct ocfs2_group_desc *bg);
static inline void ocfs2_debug_suballoc_inode(struct ocfs2_dinode *fe); static inline void ocfs2_debug_suballoc_inode(struct ocfs2_dinode *fe);
static inline u16 ocfs2_find_victim_chain(struct ocfs2_chain_list *cl); static inline u16 ocfs2_find_victim_chain(struct ocfs2_chain_list *cl);
@@ -1845,6 +1856,7 @@ static int ocfs2_claim_suballoc_bits(struct ocfs2_alloc_context *ac,
int status; int status;
u16 victim, i; u16 victim, i;
u16 bits_left = 0; u16 bits_left = 0;
u64 hint = ac->ac_last_group;
struct ocfs2_chain_list *cl; struct ocfs2_chain_list *cl;
struct ocfs2_dinode *fe; struct ocfs2_dinode *fe;
@@ -1872,7 +1884,7 @@ static int ocfs2_claim_suballoc_bits(struct ocfs2_alloc_context *ac,
goto bail; goto bail;
} }
res->sr_bg_blkno = ac->ac_last_group; res->sr_bg_blkno = hint;
if (res->sr_bg_blkno) { if (res->sr_bg_blkno) {
/* Attempt to short-circuit the usual search mechanism /* Attempt to short-circuit the usual search mechanism
* by jumping straight to the most recently used * by jumping straight to the most recently used
@@ -1896,8 +1908,10 @@ static int ocfs2_claim_suballoc_bits(struct ocfs2_alloc_context *ac,
status = ocfs2_search_chain(ac, handle, bits_wanted, min_bits, status = ocfs2_search_chain(ac, handle, bits_wanted, min_bits,
res, &bits_left); res, &bits_left);
if (!status) if (!status) {
hint = ocfs2_group_from_res(res);
goto set_hint; goto set_hint;
}
if (status < 0 && status != -ENOSPC) { if (status < 0 && status != -ENOSPC) {
mlog_errno(status); mlog_errno(status);
goto bail; goto bail;
@@ -1920,8 +1934,10 @@ static int ocfs2_claim_suballoc_bits(struct ocfs2_alloc_context *ac,
ac->ac_chain = i; ac->ac_chain = i;
status = ocfs2_search_chain(ac, handle, bits_wanted, min_bits, status = ocfs2_search_chain(ac, handle, bits_wanted, min_bits,
res, &bits_left); res, &bits_left);
if (!status) if (!status) {
hint = ocfs2_group_from_res(res);
break; break;
}
if (status < 0 && status != -ENOSPC) { if (status < 0 && status != -ENOSPC) {
mlog_errno(status); mlog_errno(status);
goto bail; goto bail;
@@ -1936,7 +1952,7 @@ set_hint:
if (bits_left < min_bits) if (bits_left < min_bits)
ac->ac_last_group = 0; ac->ac_last_group = 0;
else else
ac->ac_last_group = res->sr_bg_blkno; ac->ac_last_group = hint;
} }
bail: bail: