leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Btrfs: deal with NULL space info

Browse Source 
After a balance it is briefly possible for the space info
field in the inode to be NULL.  This adds some checks
to make sure things properly deal with the NULL value.


Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Chris Mason 2009-09-22 14:45:50 -04:00
parent 1b2da372b0
commit 33b4d47f5e
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fs/btrfs/extent-tree.c
View File

@ -2778,6 +2778,8 @@ int btrfs_check_metadata_free_space(struct btrfs_root *root)
/* get the space info for where the metadata will live */ /* get the space info for where the metadata will live */
alloc_target = btrfs_get_alloc_profile(root, 0); alloc_target = btrfs_get_alloc_profile(root, 0);
meta_sinfo = __find_space_info(info, alloc_target); meta_sinfo = __find_space_info(info, alloc_target);
if (!meta_sinfo)
goto alloc;
again: again:
spin_lock(&meta_sinfo->lock); spin_lock(&meta_sinfo->lock);
@ -2795,7 +2797,7 @@ again:
if (!meta_sinfo->full) { if (!meta_sinfo->full) {
meta_sinfo->force_alloc = 1; meta_sinfo->force_alloc = 1;
spin_unlock(&meta_sinfo->lock); spin_unlock(&meta_sinfo->lock);
alloc:
trans = btrfs_start_transaction(root, 1); trans = btrfs_start_transaction(root, 1);
if (!trans) if (!trans)
return -ENOMEM; return -ENOMEM;
@ -2803,6 +2805,10 @@ again:
ret = do_chunk_alloc(trans, root->fs_info->extent_root, ret = do_chunk_alloc(trans, root->fs_info->extent_root,
2 * 1024 * 1024, alloc_target, 0); 2 * 1024 * 1024, alloc_target, 0);
btrfs_end_transaction(trans, root); btrfs_end_transaction(trans, root);
if (!meta_sinfo) {
meta_sinfo = __find_space_info(info,
alloc_target);
}
goto again; goto again;
} }
spin_unlock(&meta_sinfo->lock); spin_unlock(&meta_sinfo->lock);
@ -2838,6 +2844,9 @@ int btrfs_check_data_free_space(struct btrfs_root *root, struct inode *inode,
bytes = (bytes + root->sectorsize - 1) & ~((u64)root->sectorsize - 1); bytes = (bytes + root->sectorsize - 1) & ~((u64)root->sectorsize - 1);
data_sinfo = BTRFS_I(inode)->space_info; data_sinfo = BTRFS_I(inode)->space_info;
if (!data_sinfo)
goto alloc;
again: again:
/* make sure we have enough space to handle the data first */ /* make sure we have enough space to handle the data first */
spin_lock(&data_sinfo->lock); spin_lock(&data_sinfo->lock);
@ -2856,7 +2865,7 @@ again:
data_sinfo->force_alloc = 1; data_sinfo->force_alloc = 1;
spin_unlock(&data_sinfo->lock); spin_unlock(&data_sinfo->lock);
alloc:
alloc_target = btrfs_get_alloc_profile(root, 1); alloc_target = btrfs_get_alloc_profile(root, 1);
trans = btrfs_start_transaction(root, 1); trans = btrfs_start_transaction(root, 1);
if (!trans) if (!trans)
@ -2868,6 +2877,11 @@ again:
btrfs_end_transaction(trans, root); btrfs_end_transaction(trans, root);
if (ret) if (ret)
return ret; return ret;
if (!data_sinfo) {
btrfs_set_inode_space_info(root, inode);
data_sinfo = BTRFS_I(inode)->space_info;
}
goto again; goto again;
} }
spin_unlock(&data_sinfo->lock); spin_unlock(&data_sinfo->lock);