summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorShen Feng <shen@cn.fujitsu.com>2009-04-02 16:46:06 -0400
committerChris Mason <chris.mason@oracle.com>2009-04-02 16:46:06 -0400
commit09771430f3b46ee27c69daa7ecad82007568e834 (patch)
treeeb51c0f62c3c0672102cf53a731ca6ed68e1be49 /fs
parentb5555f77115bfba3630fefff2d4e68140b644171 (diff)
downloadlinux-3.10-09771430f3b46ee27c69daa7ecad82007568e834.tar.gz
linux-3.10-09771430f3b46ee27c69daa7ecad82007568e834.tar.bz2
linux-3.10-09771430f3b46ee27c69daa7ecad82007568e834.zip
Btrfs: free inode struct when btrfs_new_inode fails
btrfs_new_inode doesn't call iput to free the inode when it fails. Signed-off-by: Shen Feng <shen@cn.fujitsu.com> Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/inode.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 1cff528d5b5..0ecb3fa75dc 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -3481,8 +3481,10 @@ static struct inode *btrfs_new_inode(struct btrfs_trans_handle *trans,
if (dir) {
ret = btrfs_set_inode_index(dir, index);
- if (ret)
+ if (ret) {
+ iput(inode);
return ERR_PTR(ret);
+ }
}
/*
* index_cnt is ignored for everything but a dir,
@@ -3565,6 +3567,7 @@ fail:
if (dir)
BTRFS_I(dir)->index_cnt--;
btrfs_free_path(path);
+ iput(inode);
return ERR_PTR(ret);
}