diff options
author | Coly Li <coyli@suse.de> | 2007-10-16 18:38:25 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2007-10-17 18:49:59 -0400 |
commit | f077d0d7ea5d65d01f2ce2e7131e964c13a32433 (patch) | |
tree | 17022250e65dd332ea6da88e70df7df3f27725dc /fs/ext4/super.c | |
parent | 6f38c74f5a01c7bccf58f9d7ee47ea24fb45752f (diff) |
ext4: Remove (partial, never completed) fragment support
Fragment support in ext2/3/4 was never implemented, and it probably will
never be implemented. So remove it from ext4.
Signed-off-by: Coly Li <coyli@suse.de>
Acked-by: Andreas Dilger <adilger@clusterfs.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/super.c')
-rw-r--r-- | fs/ext4/super.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 83f9cd358e5a..e2bdf93693a6 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
@@ -1726,14 +1726,6 @@ static int ext4_fill_super (struct super_block *sb, void *data, int silent) | |||
1726 | if (sbi->s_inode_size > EXT4_GOOD_OLD_INODE_SIZE) | 1726 | if (sbi->s_inode_size > EXT4_GOOD_OLD_INODE_SIZE) |
1727 | sb->s_time_gran = 1 << (EXT4_EPOCH_BITS - 2); | 1727 | sb->s_time_gran = 1 << (EXT4_EPOCH_BITS - 2); |
1728 | } | 1728 | } |
1729 | sbi->s_frag_size = EXT4_MIN_FRAG_SIZE << | ||
1730 | le32_to_cpu(es->s_log_frag_size); | ||
1731 | if (blocksize != sbi->s_frag_size) { | ||
1732 | printk(KERN_ERR | ||
1733 | "EXT4-fs: fragsize %lu != blocksize %u (unsupported)\n", | ||
1734 | sbi->s_frag_size, blocksize); | ||
1735 | goto failed_mount; | ||
1736 | } | ||
1737 | sbi->s_desc_size = le16_to_cpu(es->s_desc_size); | 1729 | sbi->s_desc_size = le16_to_cpu(es->s_desc_size); |
1738 | if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_64BIT)) { | 1730 | if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_64BIT)) { |
1739 | if (sbi->s_desc_size < EXT4_MIN_DESC_SIZE_64BIT || | 1731 | if (sbi->s_desc_size < EXT4_MIN_DESC_SIZE_64BIT || |
@@ -1747,7 +1739,6 @@ static int ext4_fill_super (struct super_block *sb, void *data, int silent) | |||
1747 | } else | 1739 | } else |
1748 | sbi->s_desc_size = EXT4_MIN_DESC_SIZE; | 1740 | sbi->s_desc_size = EXT4_MIN_DESC_SIZE; |
1749 | sbi->s_blocks_per_group = le32_to_cpu(es->s_blocks_per_group); | 1741 | sbi->s_blocks_per_group = le32_to_cpu(es->s_blocks_per_group); |
1750 | sbi->s_frags_per_group = le32_to_cpu(es->s_frags_per_group); | ||
1751 | sbi->s_inodes_per_group = le32_to_cpu(es->s_inodes_per_group); | 1742 | sbi->s_inodes_per_group = le32_to_cpu(es->s_inodes_per_group); |
1752 | if (EXT4_INODE_SIZE(sb) == 0) | 1743 | if (EXT4_INODE_SIZE(sb) == 0) |
1753 | goto cantfind_ext4; | 1744 | goto cantfind_ext4; |
@@ -1771,12 +1762,6 @@ static int ext4_fill_super (struct super_block *sb, void *data, int silent) | |||
1771 | sbi->s_blocks_per_group); | 1762 | sbi->s_blocks_per_group); |
1772 | goto failed_mount; | 1763 | goto failed_mount; |
1773 | } | 1764 | } |
1774 | if (sbi->s_frags_per_group > blocksize * 8) { | ||
1775 | printk (KERN_ERR | ||
1776 | "EXT4-fs: #fragments per group too big: %lu\n", | ||
1777 | sbi->s_frags_per_group); | ||
1778 | goto failed_mount; | ||
1779 | } | ||
1780 | if (sbi->s_inodes_per_group > blocksize * 8) { | 1765 | if (sbi->s_inodes_per_group > blocksize * 8) { |
1781 | printk (KERN_ERR | 1766 | printk (KERN_ERR |
1782 | "EXT4-fs: #inodes per group too big: %lu\n", | 1767 | "EXT4-fs: #inodes per group too big: %lu\n", |