@@ -4438,15 +4438,14 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans,
BUG_ON(!path);
inode = new_inode(root->fs_info->sb);
- if (!inode)
- return ERR_PTR(-ENOMEM);
-
+ if (!inode) {
+ ret = -ENOMEM;
+ goto fail_path;
+ }
if (dir) {
ret = btrfs_set_inode_index(dir, index);
- if (ret) {
- iput(inode);
- return ERR_PTR(ret);
- }
+ if (ret)
+ goto fail_inode;
}
/*
* index_cnt is ignored for everything but a dir,
@@ -4519,8 +4518,10 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans,
fail:
if (dir)
BTRFS_I(dir)->index_cnt--;
- btrfs_free_path(path);
+fail_inode:
iput(inode);
+fail_path:
+ btrfs_free_path(path);
return ERR_PTR(ret);
}