From patchwork Mon Sep 5 17:25:44 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: 1125162 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p85HUFiY030595 for ; Mon, 5 Sep 2011 17:30:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752673Ab1IER3E (ORCPT ); Mon, 5 Sep 2011 13:29:04 -0400 Received: from e28smtp04.in.ibm.com ([122.248.162.4]:59201 "EHLO e28smtp04.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752281Ab1IER2y (ORCPT ); Mon, 5 Sep 2011 13:28:54 -0400 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by e28smtp04.in.ibm.com (8.14.4/8.13.1) with ESMTP id p85HSpA0022875; Mon, 5 Sep 2011 22:58:51 +0530 Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p85HRY1m3231792; Mon, 5 Sep 2011 22:57:34 +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 p85HRXom021924; Tue, 6 Sep 2011 03:27:34 +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 p85HR6rd021311; Tue, 6 Sep 2011 03:27:32 +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 22/26] vfs: Cache richacl in struct inode Date: Mon, 5 Sep 2011 22:55:44 +0530 Message-Id: <1315243548-18664-23-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> 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 (demeter2.kernel.org [140.211.167.43]); Mon, 05 Sep 2011 17:30:16 +0000 (UTC) From: Andreas Gruenbacher Cache richacls in struct inode so that this doesn't have to be done individually in each filesystem. Signed-off-by: Andreas Gruenbacher Signed-off-by: Aneesh Kumar K.V --- fs/inode.c | 25 +++++++++++++++++---- include/linux/fs.h | 12 ++++++++- include/linux/richacl.h | 53 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 83 insertions(+), 7 deletions(-) diff --git a/fs/inode.c b/fs/inode.c index ec79246..1b442cf 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -26,6 +26,7 @@ #include #include #include /* for inode_has_buffers */ +#include #include "internal.h" /* @@ -192,7 +193,12 @@ int inode_init_always(struct super_block *sb, struct inode *inode) inode->i_private = NULL; inode->i_mapping = mapping; #ifdef CONFIG_FS_POSIX_ACL - inode->i_acl = inode->i_default_acl = ACL_NOT_CACHED; + if (IS_POSIXACL(inode)) + inode->i_acl = inode->i_default_acl = ACL_NOT_CACHED; +#endif +#ifdef CONFIG_FS_RICHACL + if (IS_RICHACL(inode)) + inode->i_richacl = ACL_NOT_CACHED; #endif #ifdef CONFIG_FSNOTIFY @@ -242,10 +248,19 @@ void __destroy_inode(struct inode *inode) security_inode_free(inode); fsnotify_inode_delete(inode); #ifdef CONFIG_FS_POSIX_ACL - if (inode->i_acl && inode->i_acl != ACL_NOT_CACHED) - posix_acl_release(inode->i_acl); - if (inode->i_default_acl && inode->i_default_acl != ACL_NOT_CACHED) - posix_acl_release(inode->i_default_acl); + if (IS_POSIXACL(inode)) { + if (inode->i_acl && inode->i_acl != ACL_NOT_CACHED) + posix_acl_release(inode->i_acl); + if (inode->i_default_acl && + inode->i_default_acl != ACL_NOT_CACHED) + posix_acl_release(inode->i_default_acl); + } +#endif +#ifdef CONFIG_FS_RICHACL + if (IS_RICHACL(inode)) { + if (inode->i_richacl && inode->i_richacl != ACL_NOT_CACHED) + richacl_put(inode->i_richacl); + } #endif this_cpu_dec(nr_inodes); } diff --git a/include/linux/fs.h b/include/linux/fs.h index 8d5d6e4..cfbe763 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -757,6 +757,7 @@ static inline int mapping_writably_mapped(struct address_space *mapping) #endif struct posix_acl; +struct richacl; #define ACL_NOT_CACHED ((void *)(-1)) #define IOP_FASTPERM 0x0001 @@ -775,10 +776,17 @@ struct inode { gid_t i_gid; unsigned int i_flags; + union { #ifdef CONFIG_FS_POSIX_ACL - struct posix_acl *i_acl; - struct posix_acl *i_default_acl; + struct { + struct posix_acl *i_acl; + struct posix_acl *i_default_acl; + }; #endif +#ifdef CONFIG_FS_RICHACL + struct richacl *i_richacl; +#endif + }; const struct inode_operations *i_op; struct super_block *i_sb; diff --git a/include/linux/richacl.h b/include/linux/richacl.h index ca07209..a00a9a6 100644 --- a/include/linux/richacl.h +++ b/include/linux/richacl.h @@ -189,6 +189,59 @@ richacl_put(struct richacl *acl) kfree(acl); } +#ifdef CONFIG_FS_RICHACL +static inline struct richacl *get_cached_richacl(struct inode *inode) +{ + struct richacl **p, *acl; + + p = &inode->i_richacl; + acl = ACCESS_ONCE(*p); + if (acl) { + spin_lock(&inode->i_lock); + acl = *p; + if (acl != ACL_NOT_CACHED) + acl = richacl_get(acl); + spin_unlock(&inode->i_lock); + } + return acl; +} + +static inline void set_cached_richacl(struct inode *inode, + struct richacl *acl) +{ + struct richacl *old = NULL; + spin_lock(&inode->i_lock); + old = inode->i_richacl; + inode->i_richacl = richacl_get(acl); + spin_unlock(&inode->i_lock); + if (old != ACL_NOT_CACHED) + richacl_put(old); +} + +static inline void forget_cached_richacl(struct inode *inode) +{ + struct richacl *old = NULL; + spin_lock(&inode->i_lock); + old = inode->i_richacl; + inode->i_richacl = ACL_NOT_CACHED; + spin_unlock(&inode->i_lock); + if (old != ACL_NOT_CACHED) + richacl_put(old); +} + +static inline int negative_cached_richacl(struct inode *inode) +{ + struct richacl **p, *acl; + + p = &inode->i_richacl; + acl = ACCESS_ONCE(*p); + if (acl) + return 0; + return 1; +} + +#endif + static inline int richacl_is_auto_inherit(const struct richacl *acl) {