[PATCH 08/10] btrfs: fix memory leak of btrfs_new_inode()

[Miao Xie]

btrfs_new_inode() forgets to free path when it enters the error path.

Signed-off-by: Miao Xie <mi...@cn.fujitsu.com>
---
 fs/btrfs/inode.c |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 5271887..1cef510 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -4076,15 +4076,15 @@ 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 alloc_inode_fail;
+       }
 
        if (dir) {
                ret = btrfs_set_inode_index(dir, index);
-               if (ret) {
-                       iput(inode);
-                       return ERR_PTR(ret);
-               }
+               if (ret)
+                       goto set_index_fail;
        }
        /*
         * index_cnt is ignored for everything but a dir,
@@ -4167,8 +4167,10 @@ static struct inode *btrfs_new_inode(struct 
btrfs_trans_handle *trans,
 fail:
        if (dir)
                BTRFS_I(dir)->index_cnt--;
-       btrfs_free_path(path);
+set_index_fail:
        iput(inode);
+alloc_inode_fail:
+       btrfs_free_path(path);
        return ERR_PTR(ret);
 }
 
-- 
1.6.5.2

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html