diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2009-06-08 19:56:34 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-06-24 08:17:05 -0400 |
commit | d441b1c293149212045de00f346c8ea6cd41cce4 (patch) | |
tree | cbc7aa520feeabaa90ff4b8ff83e6e8fade216c7 /fs/nilfs2/inode.c | |
parent | 5affd88a104af43f0063a12ad1ee4c7a587945dc (diff) |
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>
Diffstat (limited to 'fs/nilfs2/inode.c')
-rw-r--r-- | fs/nilfs2/inode.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c index 2696d6b513b7..fe9d8f2a13f8 100644 --- a/fs/nilfs2/inode.c +++ b/fs/nilfs2/inode.c | |||
@@ -309,10 +309,6 @@ struct inode *nilfs_new_inode(struct inode *dir, int mode) | |||
309 | /* ii->i_file_acl = 0; */ | 309 | /* ii->i_file_acl = 0; */ |
310 | /* ii->i_dir_acl = 0; */ | 310 | /* ii->i_dir_acl = 0; */ |
311 | ii->i_dir_start_lookup = 0; | 311 | ii->i_dir_start_lookup = 0; |
312 | #ifdef CONFIG_NILFS_FS_POSIX_ACL | ||
313 | ii->i_acl = NULL; | ||
314 | ii->i_default_acl = NULL; | ||
315 | #endif | ||
316 | ii->i_cno = 0; | 312 | ii->i_cno = 0; |
317 | nilfs_set_inode_flags(inode); | 313 | nilfs_set_inode_flags(inode); |
318 | spin_lock(&sbi->s_next_gen_lock); | 314 | spin_lock(&sbi->s_next_gen_lock); |
@@ -434,10 +430,6 @@ static int __nilfs_read_inode(struct super_block *sb, unsigned long ino, | |||
434 | 430 | ||
435 | raw_inode = nilfs_ifile_map_inode(sbi->s_ifile, ino, bh); | 431 | raw_inode = nilfs_ifile_map_inode(sbi->s_ifile, ino, bh); |
436 | 432 | ||
437 | #ifdef CONFIG_NILFS_FS_POSIX_ACL | ||
438 | ii->i_acl = NILFS_ACL_NOT_CACHED; | ||
439 | ii->i_default_acl = NILFS_ACL_NOT_CACHED; | ||
440 | #endif | ||
441 | if (nilfs_read_inode_common(inode, raw_inode)) | 433 | if (nilfs_read_inode_common(inode, raw_inode)) |
442 | goto failed_unmap; | 434 | goto failed_unmap; |
443 | 435 | ||