evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Btrfs: new subvolume oops fix

Browse source 
Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Chris Mason 2007-04-23 19:10:49 -04:00 • committed by David Woodhouse
parent 5d0c3e60fe
commit 5e82849e63
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs/btrfs/super.c
View file

@ -2013,6 +2013,8 @@ static int create_subvol(struct btrfs_root *root, char *name, int namelen)
BUG_ON(!trans); BUG_ON(!trans);
subvol = btrfs_alloc_free_block(trans, root); subvol = btrfs_alloc_free_block(trans, root);
if (subvol == NULL)
return -ENOSPC;
leaf = btrfs_buffer_leaf(subvol); leaf = btrfs_buffer_leaf(subvol);
btrfs_set_header_nritems(&leaf->header, 0); btrfs_set_header_nritems(&leaf->header, 0);
btrfs_set_header_level(&leaf->header, 0); btrfs_set_header_level(&leaf->header, 0);
@ -2022,8 +2024,6 @@ static int create_subvol(struct btrfs_root *root, char *name, int namelen)
memcpy(leaf->header.fsid, root->fs_info->disk_super->fsid, memcpy(leaf->header.fsid, root->fs_info->disk_super->fsid,
sizeof(leaf->header.fsid)); sizeof(leaf->header.fsid));
mark_buffer_dirty(subvol); mark_buffer_dirty(subvol);
brelse(subvol);
subvol = NULL;
inode_item = &root_item.inode; inode_item = &root_item.inode;
memset(inode_item, 0, sizeof(*inode_item)); memset(inode_item, 0, sizeof(*inode_item));
@ -2035,6 +2035,8 @@ static int create_subvol(struct btrfs_root *root, char *name, int namelen)
btrfs_set_root_blocknr(&root_item, bh_blocknr(subvol)); btrfs_set_root_blocknr(&root_item, bh_blocknr(subvol));
btrfs_set_root_refs(&root_item, 1); btrfs_set_root_refs(&root_item, 1);
brelse(subvol);
subvol = NULL;
ret = btrfs_find_free_objectid(trans, root->fs_info->tree_root, ret = btrfs_find_free_objectid(trans, root->fs_info->tree_root,
0, &objectid); 0, &objectid);