From 10634275311277ae8515b853f030ab7a9feace4c Mon Sep 17 00:00:00 2001 From: Tristan Ye Date: Fri, 27 May 2011 15:24:14 +0800 Subject: [PATCH] --- yaml --- r: 252224 b: refs/heads/master c: ea5e1675ac832b42889ac8d254ea8fbfbdfaa8b2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ocfs2/move_extents.c | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 150e0af937bb..61534463e017 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6aea6f5068cb86e89a6ac243c3fc131045b6563a +refs/heads/master: ea5e1675ac832b42889ac8d254ea8fbfbdfaa8b2 diff --git a/trunk/fs/ocfs2/move_extents.c b/trunk/fs/ocfs2/move_extents.c index d184e0b4b95f..cd9427023d2e 100644 --- a/trunk/fs/ocfs2/move_extents.c +++ b/trunk/fs/ocfs2/move_extents.c @@ -472,11 +472,23 @@ static int ocfs2_validate_and_adjust_move_goal(struct inode *inode, int ret, goal_bit = 0; 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); int c_to_b = 1 << (osb->s_clustersize_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 * 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; - /* - * 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. */