diff options
Diffstat (limited to 'fs/ext4')
-rw-r--r-- | fs/ext4/super.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 22158ebfae2a..fc3eb79faa49 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
@@ -1415,8 +1415,6 @@ static void ext4_orphan_cleanup (struct super_block * sb, | |||
1415 | sb->s_flags = s_flags; /* Restore MS_RDONLY status */ | 1415 | sb->s_flags = s_flags; /* Restore MS_RDONLY status */ |
1416 | } | 1416 | } |
1417 | 1417 | ||
1418 | #define log2(n) ffz(~(n)) | ||
1419 | |||
1420 | /* | 1418 | /* |
1421 | * Maximal file size. There is a direct, and {,double-,triple-}indirect | 1419 | * Maximal file size. There is a direct, and {,double-,triple-}indirect |
1422 | * block limit, and also a limit of (2^32 - 1) 512-byte sectors in i_blocks. | 1420 | * block limit, and also a limit of (2^32 - 1) 512-byte sectors in i_blocks. |
@@ -1689,8 +1687,8 @@ static int ext4_fill_super (struct super_block *sb, void *data, int silent) | |||
1689 | sbi->s_desc_per_block = blocksize / EXT4_DESC_SIZE(sb); | 1687 | sbi->s_desc_per_block = blocksize / EXT4_DESC_SIZE(sb); |
1690 | sbi->s_sbh = bh; | 1688 | sbi->s_sbh = bh; |
1691 | sbi->s_mount_state = le16_to_cpu(es->s_state); | 1689 | sbi->s_mount_state = le16_to_cpu(es->s_state); |
1692 | sbi->s_addr_per_block_bits = log2(EXT4_ADDR_PER_BLOCK(sb)); | 1690 | sbi->s_addr_per_block_bits = ilog2(EXT4_ADDR_PER_BLOCK(sb)); |
1693 | sbi->s_desc_per_block_bits = log2(EXT4_DESC_PER_BLOCK(sb)); | 1691 | sbi->s_desc_per_block_bits = ilog2(EXT4_DESC_PER_BLOCK(sb)); |
1694 | for (i=0; i < 4; i++) | 1692 | for (i=0; i < 4; i++) |
1695 | sbi->s_hash_seed[i] = le32_to_cpu(es->s_hash_seed[i]); | 1693 | sbi->s_hash_seed[i] = le32_to_cpu(es->s_hash_seed[i]); |
1696 | sbi->s_def_hash_version = es->s_def_hash_version; | 1694 | sbi->s_def_hash_version = es->s_def_hash_version; |