History

md: Turn rdev->sb_offset into a sector-based quantity.

Rename it to sb_start to make sure all users have been converted.

Andre Noll committed 18 years ago

Commit 0f420351 parent b73df2d3 files · +44 −49Browse files

Unified · Split

3 files
  1. drivers/md/bitmap.c +5 −5
  2. drivers/md/md.c +38 −43
  3. include/linux/raid/md_k.h +1 −1
drivers/md/bitmap.c+5−5
@@ -225,7 +225,7 @@ static struct page *read_sb_page(mddev_t *mddev, long offset, unsigned long inde · 224 unmodified lines
225 || test_bit(Faulty, &rdev->flags))225 || test_bit(Faulty, &rdev->flags))
226 continue;226 continue;
227 227
228 target = (rdev->sb_offset << 1) + offset + index * (PAGE_SIZE/512);228 target = rdev->sb_start + offset + index * (PAGE_SIZE/512);
229 229
230 if (sync_page_io(rdev->bdev, target, PAGE_SIZE, page, READ)) {230 if (sync_page_io(rdev->bdev, target, PAGE_SIZE, page, READ)) {
231 page->index = index;231 page->index = index;
@@ -262,12 +262,12 @@ static int write_sb_page(struct bitmap *bitmap, struct page *page, int wait) · 30 unmodified lines
262 /* bitmap runs in to metadata */262 /* bitmap runs in to metadata */
263 return -EINVAL;263 return -EINVAL;
264 if (rdev->data_offset + mddev->size*2264 if (rdev->data_offset + mddev->size*2
265 > rdev->sb_offset*2 + bitmap->offset)265 > rdev->sb_start + bitmap->offset)
266 /* data runs in to bitmap */266 /* data runs in to bitmap */
267 return -EINVAL;267 return -EINVAL;
268 } else if (rdev->sb_offset*2 < rdev->data_offset) {268 } else if (rdev->sb_start < rdev->data_offset) {
269 /* METADATA BITMAP DATA */269 /* METADATA BITMAP DATA */
270 if (rdev->sb_offset*2270 if (rdev->sb_start
271 + bitmap->offset271 + bitmap->offset
272 + page->index*(PAGE_SIZE/512) + size/512272 + page->index*(PAGE_SIZE/512) + size/512
273 > rdev->data_offset)273 > rdev->data_offset)
@@ -277,7 +277,7 @@ static int write_sb_page(struct bitmap *bitmap, struct page *page, int wait) · 3 unmodified lines
277 /* DATA METADATA BITMAP - no problems */277 /* DATA METADATA BITMAP - no problems */
278 }278 }
279 md_super_write(mddev, rdev,279 md_super_write(mddev, rdev,
280 (rdev->sb_offset<<1) + bitmap->offset280 rdev->sb_start + bitmap->offset
281 + page->index * (PAGE_SIZE/512),281 + page->index * (PAGE_SIZE/512),
282 size,282 size,
283 page);283 page);
drivers/md/md.c+38−43
@@ -356,7 +356,7 @@ static inline sector_t calc_dev_sboffset(struct block_device *bdev) · 355 unmodified lines
356 356
357static sector_t calc_num_sectors(mdk_rdev_t *rdev, unsigned chunk_size)357static sector_t calc_num_sectors(mdk_rdev_t *rdev, unsigned chunk_size)
358{358{
359 sector_t num_sectors = rdev->sb_offset * 2;359 sector_t num_sectors = rdev->sb_start;
360 360
361 if (chunk_size)361 if (chunk_size)
362 num_sectors &= ~((sector_t)chunk_size/512 - 1);362 num_sectors &= ~((sector_t)chunk_size/512 - 1);
@@ -383,7 +383,7 @@ static void free_disk_sb(mdk_rdev_t * rdev) · 20 unmodified lines
383 put_page(rdev->sb_page);383 put_page(rdev->sb_page);
384 rdev->sb_loaded = 0;384 rdev->sb_loaded = 0;
385 rdev->sb_page = NULL;385 rdev->sb_page = NULL;
386 rdev->sb_offset = 0;386 rdev->sb_start = 0;
387 rdev->size = 0;387 rdev->size = 0;
388 }388 }
389}389}
@@ -529,7 +529,7 @@ static int read_disk_sb(mdk_rdev_t * rdev, int size) · 139 unmodified lines
529 return 0;529 return 0;
530 530
531 531
532 if (!sync_page_io(rdev->bdev, rdev->sb_offset<<1, size, rdev->sb_page, READ))532 if (!sync_page_io(rdev->bdev, rdev->sb_start, size, rdev->sb_page, READ))
533 goto fail;533 goto fail;
534 rdev->sb_loaded = 1;534 rdev->sb_loaded = 1;
535 return 0;535 return 0;
@@ -666,16 +666,14 @@ static int super_90_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev, int minor_version · 130 unmodified lines
666 char b[BDEVNAME_SIZE], b2[BDEVNAME_SIZE];666 char b[BDEVNAME_SIZE], b2[BDEVNAME_SIZE];
667 mdp_super_t *sb;667 mdp_super_t *sb;
668 int ret;668 int ret;
669 sector_t sb_offset;
670 669
671 /*670 /*
672 * Calculate the position of the superblock,671 * Calculate the position of the superblock (512byte sectors),
673 * it's at the end of the disk.672 * it's at the end of the disk.
674 *673 *
675 * It also happens to be a multiple of 4Kb.674 * It also happens to be a multiple of 4Kb.
676 */675 */
677 sb_offset = calc_dev_sboffset(rdev->bdev) / 2;676 rdev->sb_start = calc_dev_sboffset(rdev->bdev);
678 rdev->sb_offset = sb_offset;
679 677
680 ret = read_disk_sb(rdev, MD_SB_BYTES);678 ret = read_disk_sb(rdev, MD_SB_BYTES);
681 if (ret) return ret;679 if (ret) return ret;
@@ -1007,10 +1005,10 @@ super_90_rdev_size_change(mdk_rdev_t *rdev, unsigned long long size) · 325 unmodified lines
1007 size *= 2; /* convert to sectors */1005 size *= 2; /* convert to sectors */
1008 if (rdev->mddev->bitmap_offset)1006 if (rdev->mddev->bitmap_offset)
1009 return 0; /* can't move bitmap */1007 return 0; /* can't move bitmap */
1010 rdev->sb_offset = calc_dev_sboffset(rdev->bdev) / 2;1008 rdev->sb_start = calc_dev_sboffset(rdev->bdev);
1011 if (!size || size > rdev->sb_offset*2)1009 if (!size || size > rdev->sb_start)
1012 size = rdev->sb_offset*2;1010 size = rdev->sb_start;
1013 md_super_write(rdev->mddev, rdev, rdev->sb_offset << 1, rdev->sb_size,1011 md_super_write(rdev->mddev, rdev, rdev->sb_start, rdev->sb_size,
1014 rdev->sb_page);1012 rdev->sb_page);
1015 md_super_wait(rdev->mddev);1013 md_super_wait(rdev->mddev);
1016 return size/2; /* kB for sysfs */1014 return size/2; /* kB for sysfs */
@@ -1048,12 +1046,12 @@ static int super_1_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev, int minor_version) · 31 unmodified lines
1048{1046{
1049 struct mdp_superblock_1 *sb;1047 struct mdp_superblock_1 *sb;
1050 int ret;1048 int ret;
1051 sector_t sb_offset;1049 sector_t sb_start;
1052 char b[BDEVNAME_SIZE], b2[BDEVNAME_SIZE];1050 char b[BDEVNAME_SIZE], b2[BDEVNAME_SIZE];
1053 int bmask;1051 int bmask;
1054 1052
1055 /*1053 /*
1056 * Calculate the position of the superblock.1054 * Calculate the position of the superblock in 512byte sectors.
1057 * It is always aligned to a 4K boundary and1055 * It is always aligned to a 4K boundary and
1058 * depeding on minor_version, it can be:1056 * depeding on minor_version, it can be:
1059 * 0: At least 8K, but less than 12K, from end of device1057 * 0: At least 8K, but less than 12K, from end of device
@@ -1062,22 +1060,20 @@ static int super_1_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev, int minor_version) · 2 unmodified lines
1062 */1060 */
1063 switch(minor_version) {1061 switch(minor_version) {
1064 case 0:1062 case 0:
1065 sb_offset = rdev->bdev->bd_inode->i_size >> 9;1063 sb_start = rdev->bdev->bd_inode->i_size >> 9;
1066 sb_offset -= 8*2;1064 sb_start -= 8*2;
1067 sb_offset &= ~(sector_t)(4*2-1);1065 sb_start &= ~(sector_t)(4*2-1);
1068 /* convert from sectors to K */
1069 sb_offset /= 2;
1070 break;1066 break;
1071 case 1:1067 case 1:
1072 sb_offset = 0;1068 sb_start = 0;
1073 break;1069 break;
1074 case 2:1070 case 2:
1075 sb_offset = 4;1071 sb_start = 8;
1076 break;1072 break;
1077 default:1073 default:
1078 return -EINVAL;1074 return -EINVAL;
1079 }1075 }
1080 rdev->sb_offset = sb_offset;1076 rdev->sb_start = sb_start;
1081 1077
1082 /* superblock is rarely larger than 1K, but it can be larger,1078 /* superblock is rarely larger than 1K, but it can be larger,
1083 * and it is safe to read 4k, so we do that1079 * and it is safe to read 4k, so we do that
@@ -1091,7 +1087,7 @@ static int super_1_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev, int minor_version) · 7 unmodified lines
1091 if (sb->magic != cpu_to_le32(MD_SB_MAGIC) ||1087 if (sb->magic != cpu_to_le32(MD_SB_MAGIC) ||
1092 sb->major_version != cpu_to_le32(1) ||1088 sb->major_version != cpu_to_le32(1) ||
1093 le32_to_cpu(sb->max_dev) > (4096-256)/2 ||1089 le32_to_cpu(sb->max_dev) > (4096-256)/2 ||
1094 le64_to_cpu(sb->super_offset) != (rdev->sb_offset<<1) ||1090 le64_to_cpu(sb->super_offset) != rdev->sb_start ||
1095 (le32_to_cpu(sb->feature_map) & ~MD_FEATURE_ALL) != 0)1091 (le32_to_cpu(sb->feature_map) & ~MD_FEATURE_ALL) != 0)
1096 return -EINVAL;1092 return -EINVAL;
1097 1093
@@ -1127,7 +1123,7 @@ static int super_1_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev, int minor_version) · 29 unmodified lines
1127 rdev->sb_size = (rdev->sb_size | bmask) + 1;1123 rdev->sb_size = (rdev->sb_size | bmask) + 1;
1128 1124
1129 if (minor_version1125 if (minor_version
1130 && rdev->data_offset < sb_offset + (rdev->sb_size/512))1126 && rdev->data_offset < sb_start + (rdev->sb_size/512))
1131 return -EINVAL;1127 return -EINVAL;
1132 1128
1133 if (sb->level == cpu_to_le32(LEVEL_MULTIPATH))1129 if (sb->level == cpu_to_le32(LEVEL_MULTIPATH))
@@ -1163,7 +1159,7 @@ static int super_1_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev, int minor_version) · 29 unmodified lines
1163 if (minor_version)1159 if (minor_version)
1164 rdev->size = ((rdev->bdev->bd_inode->i_size>>9) - le64_to_cpu(sb->data_offset)) / 2;1160 rdev->size = ((rdev->bdev->bd_inode->i_size>>9) - le64_to_cpu(sb->data_offset)) / 2;
1165 else1161 else
1166 rdev->size = rdev->sb_offset;1162 rdev->size = rdev->sb_start / 2;
1167 if (rdev->size < le64_to_cpu(sb->data_size)/2)1163 if (rdev->size < le64_to_cpu(sb->data_size)/2)
1168 return -EINVAL;1164 return -EINVAL;
1169 rdev->size = le64_to_cpu(sb->data_size)/2;1165 rdev->size = le64_to_cpu(sb->data_size)/2;
@@ -1350,7 +1346,7 @@ super_1_rdev_size_change(mdk_rdev_t *rdev, unsigned long long size) · 180 unmodified lines
1350 if (size && size < rdev->mddev->size)1346 if (size && size < rdev->mddev->size)
1351 return 0; /* component must fit device */1347 return 0; /* component must fit device */
1352 size *= 2; /* convert to sectors */1348 size *= 2; /* convert to sectors */
1353 if (rdev->sb_offset < rdev->data_offset/2) {1349 if (rdev->sb_start < rdev->data_offset) {
1354 /* minor versions 1 and 2; superblock before data */1350 /* minor versions 1 and 2; superblock before data */
1355 max_size = (rdev->bdev->bd_inode->i_size >> 9);1351 max_size = (rdev->bdev->bd_inode->i_size >> 9);
1356 max_size -= rdev->data_offset;1352 max_size -= rdev->data_offset;
@@ -1361,19 +1357,19 @@ super_1_rdev_size_change(mdk_rdev_t *rdev, unsigned long long size) · 4 unmodified lines
1361 return 0;1357 return 0;
1362 } else {1358 } else {
1363 /* minor version 0; superblock after data */1359 /* minor version 0; superblock after data */
1364 sector_t sb_offset;1360 sector_t sb_start;
1365 sb_offset = (rdev->bdev->bd_inode->i_size >> 9) - 8*2;1361 sb_start = (rdev->bdev->bd_inode->i_size >> 9) - 8*2;
1366 sb_offset &= ~(sector_t)(4*2 - 1);1362 sb_start &= ~(sector_t)(4*2 - 1);
1367 max_size = rdev->size*2 + sb_offset - rdev->sb_offset*2;1363 max_size = rdev->size*2 + sb_start - rdev->sb_start;
1368 if (!size || size > max_size)1364 if (!size || size > max_size)
1369 size = max_size;1365 size = max_size;
1370 rdev->sb_offset = sb_offset/2;1366 rdev->sb_start = sb_start;
1371 }1367 }
1372 sb = (struct mdp_superblock_1 *) page_address(rdev->sb_page);1368 sb = (struct mdp_superblock_1 *) page_address(rdev->sb_page);
1373 sb->data_size = cpu_to_le64(size);1369 sb->data_size = cpu_to_le64(size);
1374 sb->super_offset = rdev->sb_offset*2;1370 sb->super_offset = rdev->sb_start;
1375 sb->sb_csum = calc_sb_1_csum(sb);1371 sb->sb_csum = calc_sb_1_csum(sb);
1376 md_super_write(rdev->mddev, rdev, rdev->sb_offset << 1, rdev->sb_size,1372 md_super_write(rdev->mddev, rdev, rdev->sb_start, rdev->sb_size,
1377 rdev->sb_page);1373 rdev->sb_page);
1378 md_super_wait(rdev->mddev);1374 md_super_wait(rdev->mddev);
1379 return size/2; /* kB for sysfs */1375 return size/2; /* kB for sysfs */
@@ -1810,11 +1806,11 @@ repeat: · 430 unmodified lines
1810 dprintk("%s ", bdevname(rdev->bdev,b));1806 dprintk("%s ", bdevname(rdev->bdev,b));
1811 if (!test_bit(Faulty, &rdev->flags)) {1807 if (!test_bit(Faulty, &rdev->flags)) {
1812 md_super_write(mddev,rdev,1808 md_super_write(mddev,rdev,
1813 rdev->sb_offset<<1, rdev->sb_size,1809 rdev->sb_start, rdev->sb_size,
1814 rdev->sb_page);1810 rdev->sb_page);
1815 dprintk(KERN_INFO "(write) %s's sb offset: %llu\n",1811 dprintk(KERN_INFO "(write) %s's sb offset: %llu\n",
1816 bdevname(rdev->bdev,b),1812 bdevname(rdev->bdev,b),
1817 (unsigned long long)rdev->sb_offset);1813 (unsigned long long)rdev->sb_start);
1818 rdev->sb_events = mddev->events;1814 rdev->sb_events = mddev->events;
1819 1815
1820 } else1816 } else
@@ -3577,16 +3573,16 @@ static int do_md_run(mddev_t * mddev) · 1756 unmodified lines
3577 * We don't want the data to overlap the metadata,3573 * We don't want the data to overlap the metadata,
3578 * Internal Bitmap issues has handled elsewhere.3574 * Internal Bitmap issues has handled elsewhere.
3579 */3575 */
3580 if (rdev->data_offset < rdev->sb_offset) {3576 if (rdev->data_offset < rdev->sb_start) {
3581 if (mddev->size &&3577 if (mddev->size &&
3582 rdev->data_offset + mddev->size*23578 rdev->data_offset + mddev->size*2
3583 > rdev->sb_offset*2) {3579 > rdev->sb_start) {
3584 printk("md: %s: data overlaps metadata\n",3580 printk("md: %s: data overlaps metadata\n",
3585 mdname(mddev));3581 mdname(mddev));
3586 return -EINVAL;3582 return -EINVAL;
3587 }3583 }
3588 } else {3584 } else {
3589 if (rdev->sb_offset*2 + rdev->sb_size/5123585 if (rdev->sb_start + rdev->sb_size/512
3590 > rdev->data_offset) {3586 > rdev->data_offset) {
3591 printk("md: %s: metadata overlaps data\n",3587 printk("md: %s: metadata overlaps data\n",
3592 mdname(mddev));3588 mdname(mddev));
@@ -4355,9 +4351,9 @@ static int add_new_disk(mddev_t * mddev, mdu_disk_info_t *info) · 762 unmodified lines
4355 4351
4356 if (!mddev->persistent) {4352 if (!mddev->persistent) {
4357 printk(KERN_INFO "md: nonpersistent superblock ...\n");4353 printk(KERN_INFO "md: nonpersistent superblock ...\n");
4358 rdev->sb_offset = rdev->bdev->bd_inode->i_size >> BLOCK_SIZE_BITS;4354 rdev->sb_start = rdev->bdev->bd_inode->i_size / 512;
4359 } else 4355 } else
4360 rdev->sb_offset = calc_dev_sboffset(rdev->bdev) / 2;4356 rdev->sb_start = calc_dev_sboffset(rdev->bdev);
4361 rdev->size = calc_num_sectors(rdev, mddev->chunk_size) / 2;4357 rdev->size = calc_num_sectors(rdev, mddev->chunk_size) / 2;
4362 4358
4363 err = bind_rdev_to_array(rdev, mddev);4359 err = bind_rdev_to_array(rdev, mddev);
@@ -4424,10 +4420,9 @@ static int hot_add_disk(mddev_t * mddev, dev_t dev) · 60 unmodified lines
4424 }4420 }
4425 4421
4426 if (mddev->persistent)4422 if (mddev->persistent)
4427 rdev->sb_offset = calc_dev_sboffset(rdev->bdev) / 2;4423 rdev->sb_start = calc_dev_sboffset(rdev->bdev);
4428 else4424 else
4429 rdev->sb_offset =4425 rdev->sb_start = rdev->bdev->bd_inode->i_size / 512;
4430 rdev->bdev->bd_inode->i_size >> BLOCK_SIZE_BITS;
4431 4426
4432 rdev->size = calc_num_sectors(rdev, mddev->chunk_size) / 2;4427 rdev->size = calc_num_sectors(rdev, mddev->chunk_size) / 2;
4433 4428
@@ -4628,7 +4623,7 @@ static int update_size(mddev_t *mddev, sector_t num_sectors) · 194 unmodified lines
4628 * linear and raid0 always use whatever space is available. We can only4623 * linear and raid0 always use whatever space is available. We can only
4629 * consider changing this number if no resync or reconstruction is4624 * consider changing this number if no resync or reconstruction is
4630 * happening, and if the new size is acceptable. It must fit before the4625 * happening, and if the new size is acceptable. It must fit before the
4631 * sb_offset or, if that is <data_offset, it must fit before the size4626 * sb_start or, if that is <data_offset, it must fit before the size
4632 * of each device. If num_sectors is zero, we find the largest size4627 * of each device. If num_sectors is zero, we find the largest size
4633 * that fits.4628 * that fits.
4634 4629
include/linux/raid/md_k.h+1−1
@@ -59,7 +59,7 @@ struct mdk_rdev_s · 58 unmodified lines
59 int sb_loaded;59 int sb_loaded;
60 __u64 sb_events;60 __u64 sb_events;
61 sector_t data_offset; /* start of data in array */61 sector_t data_offset; /* start of data in array */
62 sector_t sb_offset;62 sector_t sb_start; /* offset of the super block (in 512byte sectors) */
63 int sb_size; /* bytes in the superblock */63 int sb_size; /* bytes in the superblock */
64 int preferred_minor; /* autorun support */64 int preferred_minor; /* autorun support */
65 65

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t