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

Merge branch 'move_extents' of git://oss.oracle.com/git/tye/linux-2.6 into ocfs2-merge-window

Browse Source
This commit is contained in:
Joel Becker
2011-05-27 00:24:03 -07:00
parent ece928df16 ea5e1675ac
commit d194f1aa19
1 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
fs/ocfs2/move_extents.c
View File

@@ -368,7 +368,7 @@ static int ocfs2_find_victim_alloc_group(struct inode *inode,
int *vict_bit, int *vict_bit,
struct buffer_head **ret_bh) struct buffer_head **ret_bh)
{ {
int ret, i, blocks_per_unit = 1; int ret, i, bits_per_unit = 0;
u64 blkno; u64 blkno;
char namebuf[40]; char namebuf[40];
@@ -398,14 +398,14 @@ static int ocfs2_find_victim_alloc_group(struct inode *inode,
rec = &(cl->cl_recs[0]); rec = &(cl->cl_recs[0]);
if (type == GLOBAL_BITMAP_SYSTEM_INODE) if (type == GLOBAL_BITMAP_SYSTEM_INODE)
blocks_per_unit <<= (osb->s_clustersize_bits - bits_per_unit = osb->s_clustersize_bits -
inode->i_sb->s_blocksize_bits); inode->i_sb->s_blocksize_bits;
/* /*
* 'vict_blkno' was out of the valid range. * 'vict_blkno' was out of the valid range.
*/ */
if ((vict_blkno < le64_to_cpu(rec->c_blkno)) || if ((vict_blkno < le64_to_cpu(rec->c_blkno)) ||
(vict_blkno >= (le32_to_cpu(ac_dinode->id1.bitmap1.i_total) * (vict_blkno >= (le32_to_cpu(ac_dinode->id1.bitmap1.i_total) <<
blocks_per_unit))) { bits_per_unit))) {
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} }
@@ -441,8 +441,8 @@ static int ocfs2_find_victim_alloc_group(struct inode *inode,
le16_to_cpu(bg->bg_bits))) { le16_to_cpu(bg->bg_bits))) {
*ret_bh = gd_bh; *ret_bh = gd_bh;
*vict_bit = (vict_blkno - blkno) / *vict_bit = (vict_blkno - blkno) >>
blocks_per_unit; bits_per_unit;
mlog(0, "find the victim group: #%llu, " mlog(0, "find the victim group: #%llu, "
"total_bits: %u, vict_bit: %u\n", "total_bits: %u, vict_bit: %u\n",
blkno, le16_to_cpu(bg->bg_bits), blkno, le16_to_cpu(bg->bg_bits),
@@ -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,19 +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.
*/
if (range->me_goal % c_to_b)
range->me_goal = range->me_goal / c_to_b * c_to_b;
/*
* 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.
*/ */