forked from Minki/linux
switch shmem_file_setup() to alloc_file()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
853b3da10d
commit
4b42af81f0
21
mm/shmem.c
21
mm/shmem.c
@ -2647,32 +2647,29 @@ struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags
|
|||||||
if (!dentry)
|
if (!dentry)
|
||||||
goto put_memory;
|
goto put_memory;
|
||||||
|
|
||||||
error = -ENFILE;
|
|
||||||
file = get_empty_filp();
|
|
||||||
if (!file)
|
|
||||||
goto put_dentry;
|
|
||||||
|
|
||||||
error = -ENOSPC;
|
error = -ENOSPC;
|
||||||
inode = shmem_get_inode(root->d_sb, S_IFREG | S_IRWXUGO, 0, flags);
|
inode = shmem_get_inode(root->d_sb, S_IFREG | S_IRWXUGO, 0, flags);
|
||||||
if (!inode)
|
if (!inode)
|
||||||
goto close_file;
|
goto put_dentry;
|
||||||
|
|
||||||
d_instantiate(dentry, inode);
|
d_instantiate(dentry, inode);
|
||||||
inode->i_size = size;
|
inode->i_size = size;
|
||||||
inode->i_nlink = 0; /* It is unlinked */
|
inode->i_nlink = 0; /* It is unlinked */
|
||||||
init_file(file, shm_mnt, dentry, FMODE_WRITE | FMODE_READ,
|
|
||||||
&shmem_file_operations);
|
|
||||||
|
|
||||||
#ifndef CONFIG_MMU
|
#ifndef CONFIG_MMU
|
||||||
error = ramfs_nommu_expand_for_mapping(inode, size);
|
error = ramfs_nommu_expand_for_mapping(inode, size);
|
||||||
if (error)
|
if (error)
|
||||||
goto close_file;
|
goto put_dentry;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
error = -ENFILE;
|
||||||
|
file = alloc_file(shm_mnt, dentry, FMODE_WRITE | FMODE_READ,
|
||||||
|
&shmem_file_operations);
|
||||||
|
if (!file)
|
||||||
|
goto put_dentry;
|
||||||
|
|
||||||
ima_counts_get(file);
|
ima_counts_get(file);
|
||||||
return file;
|
return file;
|
||||||
|
|
||||||
close_file:
|
|
||||||
put_filp(file);
|
|
||||||
put_dentry:
|
put_dentry:
|
||||||
dput(dentry);
|
dput(dentry);
|
||||||
put_memory:
|
put_memory:
|
||||||
|
Loading…
Reference in New Issue
Block a user