dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

switch nilfs2 to inode->i_acl 

Actually, get rid of private analog, since nothing in there is
using ACLs at all so far.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2009-06-08 19:56:34 -04:00
parent 5affd88a10
commit d441b1c293
3 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/nilfs2/inode.c
View File

@ -309,10 +309,6 @@ struct inode *nilfs_new_inode(struct inode *dir, int mode)
/* ii->i_file_acl = 0; */
/* ii->i_dir_acl = 0; */
ii->i_dir_start_lookup = 0;
#ifdef CONFIG_NILFS_FS_POSIX_ACL
ii->i_acl = NULL;
ii->i_default_acl = NULL;
#endif
ii->i_cno = 0;
nilfs_set_inode_flags(inode);
spin_lock(&sbi->s_next_gen_lock);
@ -434,10 +430,6 @@ static int __nilfs_read_inode(struct super_block *sb, unsigned long ino,
raw_inode = nilfs_ifile_map_inode(sbi->s_ifile, ino, bh);
#ifdef CONFIG_NILFS_FS_POSIX_ACL
ii->i_acl = NILFS_ACL_NOT_CACHED;
ii->i_default_acl = NILFS_ACL_NOT_CACHED;
#endif
if (nilfs_read_inode_common(inode, raw_inode))
goto failed_unmap;

4
fs/nilfs2/nilfs.h
View File

@ -57,10 +57,6 @@ struct nilfs_inode_info {
* EAs.
*/
struct rw_semaphore xattr_sem;
#endif
#ifdef CONFIG_NILFS_POSIX_ACL
struct posix_acl *i_acl;
struct posix_acl *i_default_acl;
#endif
struct buffer_head *i_bh; /* i_bh contains a new or dirty
disk inode */

10
fs/nilfs2/super.c
View File

@ -189,16 +189,6 @@ static void nilfs_clear_inode(struct inode *inode)
{
struct nilfs_inode_info *ii = NILFS_I(inode);
#ifdef CONFIG_NILFS_POSIX_ACL
if (ii->i_acl && ii->i_acl != NILFS_ACL_NOT_CACHED) {
posix_acl_release(ii->i_acl);
ii->i_acl = NILFS_ACL_NOT_CACHED;
}
if (ii->i_default_acl && ii->i_default_acl != NILFS_ACL_NOT_CACHED) {
posix_acl_release(ii->i_default_acl);
ii->i_default_acl = NILFS_ACL_NOT_CACHED;
}
#endif
/*
* Free resources allocated in nilfs_read_inode(), here.
*/