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>

1 files changed, 5 insertions, 5 deletions

diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 29bef63e23ba..373c7ec1a026 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -991,7 +991,7 @@ static void update_super_roots(struct btrfs_root *root)
         struct btrfs_root_item *root_item;
         struct btrfs_super_block *super;
 
-        super = &root->fs_info->super_copy;
+        super = root->fs_info->super_copy;
 
         root_item = &root->fs_info->chunk_root->root_item;
         super->chunk_root = root_item->bytenr;
@@ -1301,12 +1301,12 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
         update_super_roots(root);
 
         if (!root->fs_info->log_root_recovering) {
-                btrfs_set_super_log_root(&root->fs_info->super_copy, 0);
-                btrfs_set_super_log_root_level(&root->fs_info->super_copy, 0);
+                btrfs_set_super_log_root(root->fs_info->super_copy, 0);
+                btrfs_set_super_log_root_level(root->fs_info->super_copy, 0);
         }
 
-        memcpy(&root->fs_info->super_for_commit, &root->fs_info->super_copy,
-               sizeof(root->fs_info->super_copy));
+        memcpy(root->fs_info->super_for_commit, root->fs_info->super_copy,
+               sizeof(*root->fs_info->super_copy));
 
         trans->transaction->blocked = 0;
         spin_lock(&root->fs_info->trans_lock);