From mboxrd@z Thu Jan 1 00:00:00 1970 From: Miao Xie Subject: [PATCH 1/7] btrfs/acl: adjust logical path of btrfs_get_acl() Date: Thu, 29 Jul 2010 16:26:25 +0800 Message-ID: <4C513B31.3010409@cn.fujitsu.com> Reply-To: miaox@cn.fujitsu.com Mime-Version: 1.0 Content-Type: text/plain; charset=GB2312 Cc: Linux Kernel , Linux Btrfs To: Chris Mason , Yan Zheng Return-path: List-ID: From: Liu Bo - There exists a memory leak. - More checks of returned "size" are needed. According to ext3_get_acl()'s style, we do some adjustments here. Signed-off-by: Liu Bo Signed-off-by: Miao Xie --- fs/btrfs/acl.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c index 1606dc1..2f4f65a 100644 --- a/fs/btrfs/acl.c +++ b/fs/btrfs/acl.c @@ -52,26 +52,25 @@ static struct posix_acl *btrfs_get_acl(struct inode *inode, int type) BUG(); } - size = __btrfs_getxattr(inode, name, "", 0); + size = __btrfs_getxattr(inode, name, NULL, 0); if (size > 0) { value = kzalloc(size, GFP_NOFS); if (!value) return ERR_PTR(-ENOMEM); size = __btrfs_getxattr(inode, name, value, size); - if (size > 0) { - acl = posix_acl_from_xattr(value, size); - if (IS_ERR(acl)) - return acl; - set_cached_acl(inode, type, acl); - } - kfree(value); + } + if (size > 0) { + acl = posix_acl_from_xattr(value, size); } else if (size == -ENOENT || size == -ENODATA || size == 0) { /* FIXME, who returns -ENOENT? I think nobody */ acl = NULL; - set_cached_acl(inode, type, acl); } else { acl = ERR_PTR(-EIO); } + kfree(value); + + if (!IS_ERR(acl)) + set_cached_acl(inode, type, acl); return acl; } -- 1.7.0.1