shmem uses get_empty_filp() and then init_file(). Their is no good reason not to just use alloc_file() like everything else. Acked-by: Miklos Szeredi <miklos@xxxxxxxxxx> Signed-off-by: Eric Paris <eparis@xxxxxxxxxx> --- mm/shmem.c | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index e7f8968..b212184 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2640,21 +2640,20 @@ struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags if (!dentry) goto put_memory; - error = -ENFILE; - file = get_empty_filp(); - if (!file) - goto put_dentry; - error = -ENOSPC; inode = shmem_get_inode(root->d_sb, S_IFREG | S_IRWXUGO, 0, flags); if (!inode) - goto close_file; + goto put_dentry; d_instantiate(dentry, inode); inode->i_size = size; inode->i_nlink = 0; /* It is unlinked */ - init_file(file, shm_mnt, dentry, FMODE_WRITE | FMODE_READ, - &shmem_file_operations); + + error = -ENFILE; + file = alloc_file(shm_mnt, dentry, FMODE_WRITE | FMODE_READ, + &shmem_file_operations); + if (!file) + goto put_dentry; ima_counts_get(file); @@ -2667,8 +2666,6 @@ struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags #endif return file; -close_file: - put_filp(file); put_dentry: dput(dentry); put_memory: -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
