Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e52ec0eb authored by Chris Mason's avatar Chris Mason
Browse files

Btrfs: Fix NULL block groups on reading the inode 



Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent edbd8d4e

fs/btrfs/extent-tree.c

+2 −2
Original line number Diff line number Diff line
@@ -1630,11 +1630,11 @@ int btrfs_alloc_extent(struct btrfs_trans_handle *trans, 
	struct btrfs_path *path;



	btrfs_set_stack_extent_refs(&extent_item, 1);



#if 0

	new_hint = max(hint_byte, 16ULL * 1024 * 1024 * 1024);

	if (new_hint < btrfs_super_total_bytes(&info->super_copy))

		hint_byte = new_hint;



#endif

	WARN_ON(num_bytes < root->sectorsize);

	ret = find_free_extent(trans, root, num_bytes, empty_size,

			       search_start, search_end, hint_byte, ins,

fs/btrfs/inode.c

+4 −0
Original line number Diff line number Diff line
@@ -402,6 +402,10 @@ void btrfs_read_locked_inode(struct inode *inode) 
	BTRFS_I(inode)->block_group = btrfs_lookup_block_group(root->fs_info,

						       alloc_group_block);



	if (!BTRFS_I(inode)->block_group) {

		BTRFS_I(inode)->block_group = btrfs_find_block_group(root,

						         NULL, 0, 0, 0);

	}

	btrfs_free_path(path);

	inode_item = NULL;