diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2009-06-24 22:58:48 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-06-24 22:58:48 +0200 |
| commit | 72c04902d1e27c8a324014cff1d4475c11b1cecd (patch) | |
| tree | 3e93abdd0a3eeedd6df5a1dc43170744f2fa7664 /mm | |
| parent | inline functions left without protection of ifdef (acl) (diff) | |
| download | linux-72c04902d1e27c8a324014cff1d4475c11b1cecd.tar.xz linux-72c04902d1e27c8a324014cff1d4475c11b1cecd.zip | |
Get "no acls for this inode" right, fix shmem breakage
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/shmem.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index 5f2019fc7895..d713239ce2ce 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1558,6 +1558,7 @@ static struct inode *shmem_get_inode(struct super_block *sb, int mode, spin_lock_init(&info->lock); info->flags = flags & VM_NORESERVE; INIT_LIST_HEAD(&info->swaplist); + cache_no_acl(inode); switch (mode & S_IFMT) { default: @@ -2379,10 +2380,6 @@ static struct inode *shmem_alloc_inode(struct super_block *sb) p = (struct shmem_inode_info *)kmem_cache_alloc(shmem_inode_cachep, GFP_KERNEL); if (!p) return NULL; -#ifdef CONFIG_TMPFS_POSIX_ACL - p->vfs_inode.i_acl = NULL; - p->vfs_inode.i_default_acl = NULL; -#endif return &p->vfs_inode; } |