From patchwork Thu Jul 29 08:28:28 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miao Xie X-Patchwork-Id: 115017 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 o6T95qA9028819 for ; Thu, 29 Jul 2010 09:06:37 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755048Ab0G2JEq (ORCPT ); Thu, 29 Jul 2010 05:04:46 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:57727 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751072Ab0G2JEp (ORCPT ); Thu, 29 Jul 2010 05:04:45 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 78002170139; 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 o6T91kvM016067; 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 3291614C00B; Thu, 29 Jul 2010 17:05:23 +0800 (CST) Message-ID: <4C513BAC.8050904@cn.fujitsu.com> Date: Thu, 29 Jul 2010 16:28:28 +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 3/7] btrfs/acl: add noacl check for 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 bb35580..b070f58 100644 --- a/fs/btrfs/acl.c +++ b/fs/btrfs/acl.c @@ -37,6 +37,9 @@ static struct posix_acl *btrfs_get_acl(struct inode *inode, int type) char *value = NULL; struct posix_acl *acl; + if (!IS_POSIXACL(inode)) + return NULL; + acl = get_cached_acl(inode, type); if (acl != ACL_NOT_CACHED) return acl;