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

Ocfs2/move_extents: Validate moving goal after the adjustment.

Browse Source 
though the goal_to_be_moved will be validated again in following moving, it's
still a good idea to validate it after adjustment at the very beginning, instead
of validating it before adjustment.

Signed-off-by: Tristan Ye <tristan.ye@oracle.com>
This commit is contained in:
Tristan Ye
2011-05-27 15:24:14 +08:00
parent 6aea6f5068
commit ea5e1675ac
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
fs/ocfs2/move_extents.c
View File

@@ -472,11 +472,23 @@ static int ocfs2_validate_and_adjust_move_goal(struct inode *inode,
int ret, goal_bit = 0; int ret, goal_bit = 0;
struct buffer_head *gd_bh = NULL; struct buffer_head *gd_bh = NULL;
struct ocfs2_group_desc *bg; struct ocfs2_group_desc *bg = NULL;
struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
int c_to_b = 1 << (osb->s_clustersize_bits - int c_to_b = 1 << (osb->s_clustersize_bits -
inode->i_sb->s_blocksize_bits); inode->i_sb->s_blocksize_bits);
/*
* make goal become cluster aligned.
*/
range->me_goal = ocfs2_block_to_cluster_start(inode->i_sb,
range->me_goal);
/*
* moving goal is not allowd to start with a group desc blok(#0 blk)
* let's compromise to the latter cluster.
*/
if (range->me_goal == le64_to_cpu(bg->bg_blkno))
range->me_goal += c_to_b;
/* /*
* validate goal sits within global_bitmap, and return the victim * validate goal sits within global_bitmap, and return the victim
* group desc * group desc
@@ -490,18 +502,6 @@ static int ocfs2_validate_and_adjust_move_goal(struct inode *inode,
bg = (struct ocfs2_group_desc *)gd_bh->b_data; bg = (struct ocfs2_group_desc *)gd_bh->b_data;
/*
* make goal become cluster aligned.
*/
range->me_goal = ocfs2_block_to_cluster_start(inode->i_sb,
range->me_goal);
/*
* moving goal is not allowd to start with a group desc blok(#0 blk)
* let's compromise to the latter cluster.
*/
if (range->me_goal == le64_to_cpu(bg->bg_blkno))
range->me_goal += c_to_b;
/* /*
* movement is not gonna cross two groups. * movement is not gonna cross two groups.
*/ */