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

Ocfs2/move_extents: Avoid doing division in extent moving.

Browse Source 
It's not wise enough to do a 64bits division anywhere in kernside, replace it
with a decent helper or proper shifts.

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

19
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),
@@ -493,9 +493,8 @@ static int ocfs2_validate_and_adjust_move_goal(struct inode *inode,
/* /*
* make goal become cluster aligned. * make goal become cluster aligned.
*/ */
if (range->me_goal % c_to_b) range->me_goal = ocfs2_block_to_cluster_start(inode->i_sb,
range->me_goal = range->me_goal / c_to_b * c_to_b; range->me_goal);
/* /*
* moving goal is not allowd to start with a group desc blok(#0 blk) * moving goal is not allowd to start with a group desc blok(#0 blk)
* let's compromise to the latter cluster. * let's compromise to the latter cluster.