From patchwork Thu Jul 29 08:26:25 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miao Xie X-Patchwork-Id: 115018 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6T95qAA028819 for ; Thu, 29 Jul 2010 09:06:38 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755341Ab0G2JF6 (ORCPT ); Thu, 29 Jul 2010 05:05:58 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:64094 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751992Ab0G2JEq (ORCPT ); Thu, 29 Jul 2010 05:04:46 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 515B8170134; Thu, 29 Jul 2010 17:04:44 +0800 (CST) Received: from fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id o6T91jpU016065; Thu, 29 Jul 2010 17:01:46 +0800 Received: from [10.167.141.211] (unknown [10.167.141.211]) by fnst.cn.fujitsu.com (Postfix) with ESMTPA id CBB0010C1A3; Thu, 29 Jul 2010 17:05:22 +0800 (CST) Message-ID: <4C513B31.3010409@cn.fujitsu.com> Date: Thu, 29 Jul 2010 16:26:25 +0800 From: Miao Xie Reply-To: miaox@cn.fujitsu.com User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.9) Gecko/20100413 Fedora/3.0.4-2.fc13 Thunderbird/3.0.4 MIME-Version: 1.0 To: Chris Mason , Yan Zheng CC: Linux Kernel , Linux Btrfs Subject: [PATCH 1/7] btrfs/acl: adjust logical path of btrfs_get_acl() Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 29 Jul 2010 09:06:38 +0000 (UTC) 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; }