diff options
Diffstat (limited to 'fs/ext2/super.c')
| -rw-r--r-- | fs/ext2/super.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/fs/ext2/super.c b/fs/ext2/super.c index 458999638c3d..1a9ffee47d56 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c | |||
| @@ -152,10 +152,6 @@ static struct inode *ext2_alloc_inode(struct super_block *sb) | |||
| 152 | ei = (struct ext2_inode_info *)kmem_cache_alloc(ext2_inode_cachep, GFP_KERNEL); | 152 | ei = (struct ext2_inode_info *)kmem_cache_alloc(ext2_inode_cachep, GFP_KERNEL); |
| 153 | if (!ei) | 153 | if (!ei) |
| 154 | return NULL; | 154 | return NULL; |
| 155 | #ifdef CONFIG_EXT2_FS_POSIX_ACL | ||
| 156 | ei->i_acl = EXT2_ACL_NOT_CACHED; | ||
| 157 | ei->i_default_acl = EXT2_ACL_NOT_CACHED; | ||
| 158 | #endif | ||
| 159 | ei->i_block_alloc_info = NULL; | 155 | ei->i_block_alloc_info = NULL; |
| 160 | ei->vfs_inode.i_version = 1; | 156 | ei->vfs_inode.i_version = 1; |
| 161 | return &ei->vfs_inode; | 157 | return &ei->vfs_inode; |
| @@ -198,18 +194,6 @@ static void destroy_inodecache(void) | |||
| 198 | static void ext2_clear_inode(struct inode *inode) | 194 | static void ext2_clear_inode(struct inode *inode) |
| 199 | { | 195 | { |
| 200 | struct ext2_block_alloc_info *rsv = EXT2_I(inode)->i_block_alloc_info; | 196 | struct ext2_block_alloc_info *rsv = EXT2_I(inode)->i_block_alloc_info; |
| 201 | #ifdef CONFIG_EXT2_FS_POSIX_ACL | ||
| 202 | struct ext2_inode_info *ei = EXT2_I(inode); | ||
| 203 | |||
| 204 | if (ei->i_acl && ei->i_acl != EXT2_ACL_NOT_CACHED) { | ||
| 205 | posix_acl_release(ei->i_acl); | ||
| 206 | ei->i_acl = EXT2_ACL_NOT_CACHED; | ||
| 207 | } | ||
| 208 | if (ei->i_default_acl && ei->i_default_acl != EXT2_ACL_NOT_CACHED) { | ||
| 209 | posix_acl_release(ei->i_default_acl); | ||
| 210 | ei->i_default_acl = EXT2_ACL_NOT_CACHED; | ||
| 211 | } | ||
| 212 | #endif | ||
| 213 | ext2_discard_reservation(inode); | 197 | ext2_discard_reservation(inode); |
| 214 | EXT2_I(inode)->i_block_alloc_info = NULL; | 198 | EXT2_I(inode)->i_block_alloc_info = NULL; |
| 215 | if (unlikely(rsv)) | 199 | if (unlikely(rsv)) |
