aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-10-11 04:21:20 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-11 14:14:18 -0400
commit70bbb3e0a07c1ff2dd383761b12f865b6002a7a0 (patch)
treeb85a2c9eed08ce38fe085bbc76b569854f0b0396 /fs
parentf4e5bc244f23ee024a4dfa034b591b219b2bfb8f (diff)
[PATCH] ext4: rename logic_sb_block
I assume this means "logical sb block". So call it that. I still don't understand the name though. A block is a block. What's different about this one? Cc: <linux-ext4@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/ext4/super.c23
1 files changed, 11 insertions, 12 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index f7ea0224f535..6cf1f185b9c1 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1423,8 +1423,7 @@ static loff_t ext4_max_size(int bits)
1423} 1423}
1424 1424
1425static ext4_fsblk_t descriptor_loc(struct super_block *sb, 1425static ext4_fsblk_t descriptor_loc(struct super_block *sb,
1426 ext4_fsblk_t logic_sb_block, 1426 ext4_fsblk_t logical_sb_block, int nr)
1427 int nr)
1428{ 1427{
1429 struct ext4_sb_info *sbi = EXT4_SB(sb); 1428 struct ext4_sb_info *sbi = EXT4_SB(sb);
1430 unsigned long bg, first_meta_bg; 1429 unsigned long bg, first_meta_bg;
@@ -1434,7 +1433,7 @@ static ext4_fsblk_t descriptor_loc(struct super_block *sb,
1434 1433
1435 if (!EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_META_BG) || 1434 if (!EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_META_BG) ||
1436 nr < first_meta_bg) 1435 nr < first_meta_bg)
1437 return (logic_sb_block + nr + 1); 1436 return logical_sb_block + nr + 1;
1438 bg = sbi->s_desc_per_block * nr; 1437 bg = sbi->s_desc_per_block * nr;
1439 if (ext4_bg_has_super(sb, bg)) 1438 if (ext4_bg_has_super(sb, bg))
1440 has_super = 1; 1439 has_super = 1;
@@ -1449,7 +1448,7 @@ static int ext4_fill_super (struct super_block *sb, void *data, int silent)
1449 struct ext4_sb_info *sbi; 1448 struct ext4_sb_info *sbi;
1450 ext4_fsblk_t block; 1449 ext4_fsblk_t block;
1451 ext4_fsblk_t sb_block = get_sb_block(&data); 1450 ext4_fsblk_t sb_block = get_sb_block(&data);
1452 ext4_fsblk_t logic_sb_block; 1451 ext4_fsblk_t logical_sb_block;
1453 unsigned long offset = 0; 1452 unsigned long offset = 0;
1454 unsigned int journal_inum = 0; 1453 unsigned int journal_inum = 0;
1455 unsigned long journal_devnum = 0; 1454 unsigned long journal_devnum = 0;
@@ -1484,13 +1483,13 @@ static int ext4_fill_super (struct super_block *sb, void *data, int silent)
1484 * block sizes. We need to calculate the offset from buffer start. 1483 * block sizes. We need to calculate the offset from buffer start.
1485 */ 1484 */
1486 if (blocksize != EXT4_MIN_BLOCK_SIZE) { 1485 if (blocksize != EXT4_MIN_BLOCK_SIZE) {
1487 logic_sb_block = sb_block * EXT4_MIN_BLOCK_SIZE; 1486 logical_sb_block = sb_block * EXT4_MIN_BLOCK_SIZE;
1488 offset = do_div(logic_sb_block, blocksize); 1487 offset = do_div(logical_sb_block, blocksize);
1489 } else { 1488 } else {
1490 logic_sb_block = sb_block; 1489 logical_sb_block = sb_block;
1491 } 1490 }
1492 1491
1493 if (!(bh = sb_bread(sb, logic_sb_block))) { 1492 if (!(bh = sb_bread(sb, logical_sb_block))) {
1494 printk (KERN_ERR "EXT4-fs: unable to read superblock\n"); 1493 printk (KERN_ERR "EXT4-fs: unable to read superblock\n");
1495 goto out_fail; 1494 goto out_fail;
1496 } 1495 }
@@ -1590,9 +1589,9 @@ static int ext4_fill_super (struct super_block *sb, void *data, int silent)
1590 1589
1591 brelse (bh); 1590 brelse (bh);
1592 sb_set_blocksize(sb, blocksize); 1591 sb_set_blocksize(sb, blocksize);
1593 logic_sb_block = sb_block * EXT4_MIN_BLOCK_SIZE; 1592 logical_sb_block = sb_block * EXT4_MIN_BLOCK_SIZE;
1594 offset = do_div(logic_sb_block, blocksize); 1593 offset = do_div(logical_sb_block, blocksize);
1595 bh = sb_bread(sb, logic_sb_block); 1594 bh = sb_bread(sb, logical_sb_block);
1596 if (!bh) { 1595 if (!bh) {
1597 printk(KERN_ERR 1596 printk(KERN_ERR
1598 "EXT4-fs: Can't read superblock on 2nd try.\n"); 1597 "EXT4-fs: Can't read superblock on 2nd try.\n");
@@ -1711,7 +1710,7 @@ static int ext4_fill_super (struct super_block *sb, void *data, int silent)
1711 bgl_lock_init(&sbi->s_blockgroup_lock); 1710 bgl_lock_init(&sbi->s_blockgroup_lock);
1712 1711
1713 for (i = 0; i < db_count; i++) { 1712 for (i = 0; i < db_count; i++) {
1714 block = descriptor_loc(sb, logic_sb_block, i); 1713 block = descriptor_loc(sb, logical_sb_block, i);
1715 sbi->s_group_desc[i] = sb_bread(sb, block); 1714 sbi->s_group_desc[i] = sb_bread(sb, block);
1716 if (!sbi->s_group_desc[i]) { 1715 if (!sbi->s_group_desc[i]) {
1717 printk (KERN_ERR "EXT4-fs: " 1716 printk (KERN_ERR "EXT4-fs: "