diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2018-01-31 16:19:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-31 17:18:39 -0800 |
| commit | 5aadc431a593ac1f3a026dfbceaa16cc4d5e15ca (patch) | |
| tree | 2e5f690366177b3b09be1595dc5a9e55f99a9fe8 | |
| parent | e9d586a8217882eb4068e3ed94a5234ba6dead34 (diff) | |
| download | linux-stable-5aadc431a593ac1f3a026dfbceaa16cc4d5e15ca.tar.gz linux-stable-5aadc431a593ac1f3a026dfbceaa16cc4d5e15ca.tar.bz2 linux-stable-5aadc431a593ac1f3a026dfbceaa16cc4d5e15ca.zip | |
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>
| -rw-r--r-- | fs/fcntl.c | 2 | ||||
| -rw-r--r-- | include/linux/shmem_fs.h | 4 | ||||
| -rw-r--r-- | mm/shmem.c | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/fs/fcntl.c b/fs/fcntl.c index c7b9e0948107..e95fa0a352ea 100644 --- a/fs/fcntl.c +++ b/fs/fcntl.c @@ -418,7 +418,7 @@ static long do_fcntl(int fd, unsigned int cmd, unsigned long arg, break; case F_ADD_SEALS: case F_GET_SEALS: - err = shmem_fcntl(filp, cmd, arg); + err = memfd_fcntl(filp, cmd, arg); break; case F_GET_RW_HINT: case F_SET_RW_HINT: diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h index e464815a7e4c..73b5e655a76e 100644 --- a/include/linux/shmem_fs.h +++ b/include/linux/shmem_fs.h @@ -112,11 +112,11 @@ extern void shmem_uncharge(struct inode *inode, long pages); #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 -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; } diff --git a/mm/shmem.c b/mm/shmem.c index 975efd81621f..86d7e06ee855 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2722,7 +2722,7 @@ continue_resched: F_SEAL_GROW | \ 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 shmem_inode_info *info = SHMEM_I(inode); @@ -2792,7 +2792,7 @@ unlock: 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) return -EINVAL; @@ -2800,7 +2800,7 @@ static int shmem_get_seals(struct file *file) 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; @@ -2810,10 +2810,10 @@ long shmem_fcntl(struct file *file, unsigned int cmd, unsigned long arg) if (arg > UINT_MAX) return -EINVAL; - error = shmem_add_seals(file, arg); + error = memfd_add_seals(file, arg); break; case F_GET_SEALS: - error = shmem_get_seals(file); + error = memfd_get_seals(file); break; default: error = -EINVAL; |