Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f19d4a8f authored by Al Viro's avatar Al Viro
Browse files

add caching of ACLs in struct inode 



No helpers, no conversions yet.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 3e63cbb1

fs/inode.c

+10 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/fsnotify.h>

#include <linux/mount.h>

#include <linux/async.h>

#include <linux/posix_acl.h>



/*

 * This is needed for the following functions:
@@ -189,6 +190,9 @@ struct inode *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;

#endif



#ifdef CONFIG_FSNOTIFY

	inode->i_fsnotify_mask = 0;
@@ -227,6 +231,12 @@ void destroy_inode(struct inode *inode) 
	ima_inode_free(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);

#endif

	if (inode->i_sb->s_op->destroy_inode)

		inode->i_sb->s_op->destroy_inode(inode);

	else

include/linux/fs.h

+7 −0
Original line number Diff line number Diff line
@@ -710,6 +710,9 @@ static inline int mapping_writably_mapped(struct address_space *mapping) 
#define i_size_ordered_init(inode) do { } while (0)

#endif



struct posix_acl;

#define ACL_NOT_CACHED ((void *)(-1))



struct inode {

	struct hlist_node	i_hash;

	struct list_head	i_list;
@@ -772,6 +775,10 @@ struct inode { 
	atomic_t		i_writecount;

#ifdef CONFIG_SECURITY

	void			*i_security;

#endif

#ifdef CONFIG_FS_POSIX_ACL

	struct posix_acl	*i_acl;

	struct posix_acl	*i_default_acl;

#endif

	void			*i_private; /* fs or device private pointer */

};