diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2009-06-08 19:56:00 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-06-24 08:17:06 -0400 |
commit | 06b16e9f68edaa1e71aee943d3c030bcf7380af1 (patch) | |
tree | fcdbc0302571e6cda4817869a377d7498a44f776 /mm/shmem.c | |
parent | 281eede0328c84a8f20e0e85b807d5b51c3de4f2 (diff) |
switch shmem to inode->i_acl
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'mm/shmem.c')
-rw-r--r-- | mm/shmem.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index e89d7ec18ed..5f2019fc789 100644 --- a/mm/shmem.c +++ b/mm/shmem.c | |||
@@ -2379,6 +2379,10 @@ static struct inode *shmem_alloc_inode(struct super_block *sb) | |||
2379 | p = (struct shmem_inode_info *)kmem_cache_alloc(shmem_inode_cachep, GFP_KERNEL); | 2379 | p = (struct shmem_inode_info *)kmem_cache_alloc(shmem_inode_cachep, GFP_KERNEL); |
2380 | if (!p) | 2380 | if (!p) |
2381 | return NULL; | 2381 | return NULL; |
2382 | #ifdef CONFIG_TMPFS_POSIX_ACL | ||
2383 | p->vfs_inode.i_acl = NULL; | ||
2384 | p->vfs_inode.i_default_acl = NULL; | ||
2385 | #endif | ||
2382 | return &p->vfs_inode; | 2386 | return &p->vfs_inode; |
2383 | } | 2387 | } |
2384 | 2388 | ||
@@ -2388,7 +2392,6 @@ static void shmem_destroy_inode(struct inode *inode) | |||
2388 | /* only struct inode is valid if it's an inline symlink */ | 2392 | /* only struct inode is valid if it's an inline symlink */ |
2389 | mpol_free_shared_policy(&SHMEM_I(inode)->policy); | 2393 | mpol_free_shared_policy(&SHMEM_I(inode)->policy); |
2390 | } | 2394 | } |
2391 | shmem_acl_destroy_inode(inode); | ||
2392 | kmem_cache_free(shmem_inode_cachep, SHMEM_I(inode)); | 2395 | kmem_cache_free(shmem_inode_cachep, SHMEM_I(inode)); |
2393 | } | 2396 | } |
2394 | 2397 | ||
@@ -2397,10 +2400,6 @@ static void init_once(void *foo) | |||
2397 | struct shmem_inode_info *p = (struct shmem_inode_info *) foo; | 2400 | struct shmem_inode_info *p = (struct shmem_inode_info *) foo; |
2398 | 2401 | ||
2399 | inode_init_once(&p->vfs_inode); | 2402 | inode_init_once(&p->vfs_inode); |
2400 | #ifdef CONFIG_TMPFS_POSIX_ACL | ||
2401 | p->i_acl = NULL; | ||
2402 | p->i_default_acl = NULL; | ||
2403 | #endif | ||
2404 | } | 2403 | } |
2405 | 2404 | ||
2406 | static int init_inodecache(void) | 2405 | static int init_inodecache(void) |