Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755223Ab0G2JEy (ORCPT ); Thu, 29 Jul 2010 05:04:54 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:54415 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1754638Ab0G2JEq (ORCPT ); Thu, 29 Jul 2010 05:04:46 -0400 Message-ID: <4C513B64.6020805@cn.fujitsu.com> Date: Thu, 29 Jul 2010 16:27:16 +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 Btrfs , Linux Kernel Subject: [PATCH 2/7] btrfs/acl: fix btrfs_xattr_acl_set() Content-Type: text/plain; charset=GB2312 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1050 Lines: 42 - cleanup unnecessary code - add validity check for acl Signed-off-by: Miao Xie --- fs/btrfs/acl.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c index 2f4f65a..bb35580 100644 --- a/fs/btrfs/acl.c +++ b/fs/btrfs/acl.c @@ -169,16 +169,17 @@ static int btrfs_xattr_acl_set(struct dentry *dentry, const char *name, if (value) { acl = posix_acl_from_xattr(value, size); - if (acl == NULL) { - value = NULL; - size = 0; - } else if (IS_ERR(acl)) { + if (acl) { + ret = posix_acl_valid(acl); + if (ret) + goto out; + } else if (IS_ERR(acl)) return PTR_ERR(acl); - } } ret = btrfs_set_acl(NULL, dentry->d_inode, acl, type); +out: posix_acl_release(acl); return ret; -- 1.7.0.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/