git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
switch shmem to inode->i_acl
[pandora-kernel.git]
/
mm
/
shmem.c
diff --git
a/mm/shmem.c
b/mm/shmem.c
index
0132fbd
..
5f2019f
100644
(file)
--- a/
mm/shmem.c
+++ b/
mm/shmem.c
@@
-1097,7
+1097,7
@@
static int shmem_writepage(struct page *page, struct writeback_control *wbc)
shmem_swp_unmap(entry);
unlock:
spin_unlock(&info->lock);
shmem_swp_unmap(entry);
unlock:
spin_unlock(&info->lock);
- swap
_free(swap
);
+ swap
cache_free(swap, NULL
);
redirty:
set_page_dirty(page);
if (wbc->for_reclaim)
redirty:
set_page_dirty(page);
if (wbc->for_reclaim)
@@
-2379,6
+2379,10
@@
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;
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;
}
return &p->vfs_inode;
}
@@
-2388,7
+2392,6
@@
static void shmem_destroy_inode(struct inode *inode)
/* only struct inode is valid if it's an inline symlink */
mpol_free_shared_policy(&SHMEM_I(inode)->policy);
}
/* only struct inode is valid if it's an inline symlink */
mpol_free_shared_policy(&SHMEM_I(inode)->policy);
}
- shmem_acl_destroy_inode(inode);
kmem_cache_free(shmem_inode_cachep, SHMEM_I(inode));
}
kmem_cache_free(shmem_inode_cachep, SHMEM_I(inode));
}
@@
-2397,10
+2400,6
@@
static void init_once(void *foo)
struct shmem_inode_info *p = (struct shmem_inode_info *) foo;
inode_init_once(&p->vfs_inode);
struct shmem_inode_info *p = (struct shmem_inode_info *) foo;
inode_init_once(&p->vfs_inode);
-#ifdef CONFIG_TMPFS_POSIX_ACL
- p->i_acl = NULL;
- p->i_default_acl = NULL;
-#endif
}
static int init_inodecache(void)
}
static int init_inodecache(void)
@@
-2612,7
+2611,7
@@
int shmem_unuse(swp_entry_t entry, struct page *page)
* @size: size to be set for the file
* @flags: VM_NORESERVE suppresses pre-accounting of the entire object size
*/
* @size: size to be set for the file
* @flags: VM_NORESERVE suppresses pre-accounting of the entire object size
*/
-struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags)
+struct file *shmem_file_setup(c
onst c
har *name, loff_t size, unsigned long flags)
{
int error;
struct file *file;
{
int error;
struct file *file;