diff options
| author | David Sterba <dsterba@suse.cz> | 2011-04-13 15:41:04 +0200 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-11-06 03:04:01 -0500 |
| commit | 6c41761fc6efe1503103a1afe03a6635c0b5d4ec (patch) | |
| tree | 08ad34d43aac48e8f8143a0b1fa07141df8f202a /fs/btrfs/compression.c | |
| parent | c8174313a8102e874aaa321e2fc4c7c460a87151 (diff) | |
| download | linux-stable-6c41761fc6efe1503103a1afe03a6635c0b5d4ec.tar.gz linux-stable-6c41761fc6efe1503103a1afe03a6635c0b5d4ec.tar.bz2 linux-stable-6c41761fc6efe1503103a1afe03a6635c0b5d4ec.zip | |
btrfs: separate superblock items out of fs_info
fs_info has now ~9kb, more than fits into one page. This will cause
mount failure when memory is too fragmented. Top space consumers are
super block structures super_copy and super_for_commit, ~2.8kb each.
Allocate them dynamically. fs_info will be ~3.5kb. (measured on x86_64)
Add a wrapper for freeing fs_info and all of it's dynamically allocated
members.
Signed-off-by: David Sterba <dsterba@suse.cz>
Diffstat (limited to 'fs/btrfs/compression.c')
| -rw-r--r-- | fs/btrfs/compression.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index 8ec5d86f1734..14f1c5a0b2d2 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c @@ -85,7 +85,8 @@ struct compressed_bio { static inline int compressed_bio_size(struct btrfs_root *root, unsigned long disk_size) { - u16 csum_size = btrfs_super_csum_size(&root->fs_info->super_copy); + u16 csum_size = btrfs_super_csum_size(root->fs_info->super_copy); + return sizeof(struct compressed_bio) + ((disk_size + root->sectorsize - 1) / root->sectorsize) * csum_size; |