adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2025-01-01 13:46:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

md: Replace calc_dev_size() by calc_num_sectors().

Browse source 
Number of sectors is the preferred unit for sizes of raid devices,
so change calc_dev_size() so that it returns this unit instead of
the number of 1K blocks.

Signed-off-by: Andre Noll <maan@systemlinux.org>
Signed-off-by: Neil Brown <neilb@suse.de>
This commit is contained in:
Andre Noll 2008-07-11 22:02:23 +10:00 committed by Neil Brown
parent d71f9f88d7
commit e7debaa495
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/md/md.c
View file

@ -353,15 +353,13 @@ static inline sector_t calc_dev_sboffset(struct block_device *bdev)
return MD_NEW_SIZE_BLOCKS(size); return MD_NEW_SIZE_BLOCKS(size);
} }
static sector_t calc_dev_size(mdk_rdev_t *rdev, unsigned chunk_size) static sector_t calc_num_sectors(mdk_rdev_t *rdev, unsigned chunk_size)
{ {
sector_t size; sector_t num_sectors = rdev->sb_offset * 2;
size = rdev->sb_offset;
if (chunk_size) if (chunk_size)
size &= ~((sector_t)chunk_size/1024 - 1); num_sectors &= ~((sector_t)chunk_size/512 - 1);
return size; return num_sectors;
} }
static int alloc_disk_sb(mdk_rdev_t * rdev) static int alloc_disk_sb(mdk_rdev_t * rdev)
@ -753,7 +751,7 @@ static int super_90_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev, int minor_version
else else
ret = 0; ret = 0;
} }
rdev->size = calc_dev_size(rdev, sb->chunk_size); rdev->size = calc_num_sectors(rdev, sb->chunk_size) / 2;
if (rdev->size < sb->size && sb->level > 1) if (rdev->size < sb->size && sb->level > 1)
/* "this cannot possibly happen" ... */ /* "this cannot possibly happen" ... */
@ -4359,7 +4357,7 @@ static int add_new_disk(mddev_t * mddev, mdu_disk_info_t *info)
rdev->sb_offset = rdev->bdev->bd_inode->i_size >> BLOCK_SIZE_BITS; rdev->sb_offset = rdev->bdev->bd_inode->i_size >> BLOCK_SIZE_BITS;
} else } else
rdev->sb_offset = calc_dev_sboffset(rdev->bdev); rdev->sb_offset = calc_dev_sboffset(rdev->bdev);
rdev->size = calc_dev_size(rdev, mddev->chunk_size); rdev->size = calc_num_sectors(rdev, mddev->chunk_size) / 2;
err = bind_rdev_to_array(rdev, mddev); err = bind_rdev_to_array(rdev, mddev);
if (err) { if (err) {
@ -4398,7 +4396,6 @@ static int hot_add_disk(mddev_t * mddev, dev_t dev)
{ {
char b[BDEVNAME_SIZE]; char b[BDEVNAME_SIZE];
int err; int err;
unsigned int size;
mdk_rdev_t *rdev; mdk_rdev_t *rdev;
if (!mddev->pers) if (!mddev->pers)
@ -4431,8 +4428,7 @@ static int hot_add_disk(mddev_t * mddev, dev_t dev)
rdev->sb_offset = rdev->sb_offset =
rdev->bdev->bd_inode->i_size >> BLOCK_SIZE_BITS; rdev->bdev->bd_inode->i_size >> BLOCK_SIZE_BITS;
size = calc_dev_size(rdev, mddev->chunk_size); rdev->size = calc_num_sectors(rdev, mddev->chunk_size) / 2;
rdev->size = size;
if (test_bit(Faulty, &rdev->flags)) { if (test_bit(Faulty, &rdev->flags)) {
printk(KERN_WARNING printk(KERN_WARNING