From patchwork Mon Sep 5 17:25:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aneesh Kumar K.V" X-Patchwork-Id: 1125252 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p85HVnKH011689 for ; Mon, 5 Sep 2011 17:32:24 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752208Ab1IERcH (ORCPT ); Mon, 5 Sep 2011 13:32:07 -0400 Received: from e28smtp09.in.ibm.com ([122.248.162.9]:40979 "EHLO e28smtp09.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752058Ab1IER1X (ORCPT ); Mon, 5 Sep 2011 13:27:23 -0400 Received: from /spool/local by in.ibm.com with XMail ESMTP for from ; Mon, 5 Sep 2011 22:57:21 +0530 Received: from d28relay01.in.ibm.com ([9.184.220.58]) by in.ibm.com ([192.168.1.139]) with XMail ESMTP; Mon, 5 Sep 2011 22:57:17 +0530 Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p85HRGtE3145972; Mon, 5 Sep 2011 22:57:16 +0530 Received: from d28av03.in.ibm.com (loopback [127.0.0.1]) by d28av03.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p85HRFYG021512; Tue, 6 Sep 2011 03:27:16 +1000 Received: from skywalker.ibm.com ([9.126.239.225]) by d28av03.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p85HR6rO021311; Tue, 6 Sep 2011 03:27:14 +1000 From: "Aneesh Kumar K.V" To: agruen@kernel.org, bfields@fieldses.org, akpm@linux-foundation.org, dhowells@redhat.com Cc: aneesh.kumar@linux.vnet.ibm.com, linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH -V6 07/26] vfs: Optimize out IS_RICHACL() if CONFIG_FS_RICHACL is not defined Date: Mon, 5 Sep 2011 22:55:29 +0530 Message-Id: <1315243548-18664-8-git-send-email-aneesh.kumar@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1315243548-18664-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> References: <1315243548-18664-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> x-cbid: 11090517-2674-0000-0000-00000042DAD5 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 05 Sep 2011 17:32:24 +0000 (UTC) From: Andreas Gruenbacher if CONFIG_FS_RICHACL is not defined optimize out the ACL check function. Signed-off-by: Andreas Gruenbacher Signed-off-by: Aneesh Kumar K.V --- fs/Kconfig | 3 +++ include/linux/fs.h | 5 +++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/fs/Kconfig b/fs/Kconfig index 9fe0b34..7939190 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -46,6 +46,9 @@ endif # BLOCK config FS_POSIX_ACL def_bool n +config FS_RICHACL + def_bool n + config EXPORTFS tristate diff --git a/include/linux/fs.h b/include/linux/fs.h index 6eac730..1ddec24 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -273,7 +273,12 @@ struct inodes_stat_t { #define IS_APPEND(inode) ((inode)->i_flags & S_APPEND) #define IS_IMMUTABLE(inode) ((inode)->i_flags & S_IMMUTABLE) #define IS_POSIXACL(inode) __IS_FLG(inode, MS_POSIXACL) + +#ifdef CONFIG_FS_RICHACL #define IS_RICHACL(inode) __IS_FLG(inode, MS_RICHACL) +#else +#define IS_RICHACL(inode) 0 +#endif #define IS_DEADDIR(inode) ((inode)->i_flags & S_DEAD) #define IS_NOCMTIME(inode) ((inode)->i_flags & S_NOCMTIME)