UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

shmem: rename functions that are memfd-related 

Those functions are called for memfd files, backed by shmem or hugetlb
(the next patches will handle hugetlb).

Link: http://lkml.kernel.org/r/20171107122800.25517-3-marcandre.lureau@redhat.com
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Marc-André Lureau 2018-01-31 16:19:18 -08:00 committed by Linus Torvalds
parent e9d586a821
commit 5aadc431a5
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/fcntl.c
View File

@ -418,7 +418,7 @@ static long do_fcntl(int fd, unsigned int cmd, unsigned long arg,
break; break;
case F_ADD_SEALS: case F_ADD_SEALS:
case F_GET_SEALS: case F_GET_SEALS:
err = shmem_fcntl(filp, cmd, arg); err = memfd_fcntl(filp, cmd, arg);
break; break;
case F_GET_RW_HINT: case F_GET_RW_HINT:
case F_SET_RW_HINT: case F_SET_RW_HINT:

4
include/linux/shmem_fs.h
View File

@ -112,11 +112,11 @@ extern void shmem_uncharge(struct inode *inode, long pages);
#ifdef CONFIG_TMPFS #ifdef CONFIG_TMPFS
extern long shmem_fcntl(struct file *file, unsigned int cmd, unsigned long arg); extern long memfd_fcntl(struct file *file, unsigned int cmd, unsigned long arg);
#else #else
static inline long shmem_fcntl(struct file *f, unsigned int c, unsigned long a) static inline long memfd_fcntl(struct file *f, unsigned int c, unsigned long a)
{ {
return -EINVAL; return -EINVAL;
} }

10
mm/shmem.c
View File

@ -2722,7 +2722,7 @@ continue_resched:
F_SEAL_GROW | \ F_SEAL_GROW | \
F_SEAL_WRITE) F_SEAL_WRITE)
static int shmem_add_seals(struct file *file, unsigned int seals) static int memfd_add_seals(struct file *file, unsigned int seals)
{ {
struct inode *inode = file_inode(file); struct inode *inode = file_inode(file);
struct shmem_inode_info *info = SHMEM_I(inode); struct shmem_inode_info *info = SHMEM_I(inode);
@ -2792,7 +2792,7 @@ unlock:
return error; return error;
} }
static int shmem_get_seals(struct file *file) static int memfd_get_seals(struct file *file)
{ {
if (file->f_op != &shmem_file_operations) if (file->f_op != &shmem_file_operations)
return -EINVAL; return -EINVAL;
@ -2800,7 +2800,7 @@ static int shmem_get_seals(struct file *file)
return SHMEM_I(file_inode(file))->seals; return SHMEM_I(file_inode(file))->seals;
} }
long shmem_fcntl(struct file *file, unsigned int cmd, unsigned long arg) long memfd_fcntl(struct file *file, unsigned int cmd, unsigned long arg)
{ {
long error; long error;
@ -2810,10 +2810,10 @@ long shmem_fcntl(struct file *file, unsigned int cmd, unsigned long arg)
if (arg > UINT_MAX) if (arg > UINT_MAX)
return -EINVAL; return -EINVAL;
error = shmem_add_seals(file, arg); error = memfd_add_seals(file, arg);
break; break;
case F_GET_SEALS: case F_GET_SEALS:
error = shmem_get_seals(file); error = memfd_get_seals(file);
break; break;
default: default:
error = -EINVAL; error = -EINVAL;