diff options
author | Chris Mason <chris.mason@oracle.com> | 2007-06-12 11:36:58 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@hera.kernel.org> | 2007-06-12 11:36:58 -0400 |
commit | 340887809d92a4dd6c71caa97d658cef32c098c3 (patch) | |
tree | 4767f84fa4b066ac57c5df15741bda47766fe8ce /fs/btrfs/inode.c | |
parent | 6cbd55707802b98843f953d1ae6d8f5bcd9a76c0 (diff) |
Btrfs: i386 fixes from axboe
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/inode.c')
-rw-r--r-- | fs/btrfs/inode.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 46f869d6d0fb..d3d5a4cdb6af 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
@@ -1754,6 +1754,7 @@ static int create_subvol(struct btrfs_root *root, char *name, int namelen) | |||
1754 | BTRFS_I(dir)->block_group, S_IFDIR | 0700); | 1754 | BTRFS_I(dir)->block_group, S_IFDIR | 0700); |
1755 | inode->i_op = &btrfs_dir_inode_operations; | 1755 | inode->i_op = &btrfs_dir_inode_operations; |
1756 | inode->i_fop = &btrfs_dir_file_operations; | 1756 | inode->i_fop = &btrfs_dir_file_operations; |
1757 | new_root->inode = inode; | ||
1757 | 1758 | ||
1758 | ret = btrfs_make_empty_dir(trans, new_root, new_dirid, new_dirid); | 1759 | ret = btrfs_make_empty_dir(trans, new_root, new_dirid, new_dirid); |
1759 | BUG_ON(ret); | 1760 | BUG_ON(ret); |
@@ -1766,8 +1767,6 @@ static int create_subvol(struct btrfs_root *root, char *name, int namelen) | |||
1766 | ret = btrfs_commit_transaction(trans, new_root); | 1767 | ret = btrfs_commit_transaction(trans, new_root); |
1767 | BUG_ON(ret); | 1768 | BUG_ON(ret); |
1768 | 1769 | ||
1769 | iput(inode); | ||
1770 | |||
1771 | mutex_unlock(&root->fs_info->fs_mutex); | 1770 | mutex_unlock(&root->fs_info->fs_mutex); |
1772 | btrfs_btree_balance_dirty(root); | 1771 | btrfs_btree_balance_dirty(root); |
1773 | return 0; | 1772 | return 0; |