diff options
author | Axel Lin <axel.lin@ingics.com> | 2014-01-23 18:54:54 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-23 19:36:58 -0500 |
commit | 0fa9aa20c33d76e98f44ff1de6e128e39a7738ca (patch) | |
tree | 52d576fcb2dade29aafa8e4bc7d2bbc900b1f5f0 | |
parent | 7a5f4f1cb0e7581ee7deb938d65f97145fa045f8 (diff) |
fs/ramfs/file-nommu.c: make ramfs_nommu_get_unmapped_area() and ramfs_nommu_mmap() static
Since commit 853ac43ab194 ("shmem: unify regular and tiny shmem"),
ramfs_nommu_get_unmapped_area() and ramfs_nommu_mmap() are not directly
referenced outside of file-nommu.c. Thus make them static.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | fs/ramfs/file-nommu.c | 10 | ||||
-rw-r--r-- | include/linux/ramfs.h | 7 |
2 files changed, 8 insertions, 9 deletions
diff --git a/fs/ramfs/file-nommu.c b/fs/ramfs/file-nommu.c index 8d5b438cc188..80862b1aeea7 100644 --- a/fs/ramfs/file-nommu.c +++ b/fs/ramfs/file-nommu.c | |||
@@ -27,6 +27,12 @@ | |||
27 | #include "internal.h" | 27 | #include "internal.h" |
28 | 28 | ||
29 | static int ramfs_nommu_setattr(struct dentry *, struct iattr *); | 29 | static int ramfs_nommu_setattr(struct dentry *, struct iattr *); |
30 | static unsigned long ramfs_nommu_get_unmapped_area(struct file *file, | ||
31 | unsigned long addr, | ||
32 | unsigned long len, | ||
33 | unsigned long pgoff, | ||
34 | unsigned long flags); | ||
35 | static int ramfs_nommu_mmap(struct file *file, struct vm_area_struct *vma); | ||
30 | 36 | ||
31 | const struct address_space_operations ramfs_aops = { | 37 | const struct address_space_operations ramfs_aops = { |
32 | .readpage = simple_readpage, | 38 | .readpage = simple_readpage, |
@@ -197,7 +203,7 @@ static int ramfs_nommu_setattr(struct dentry *dentry, struct iattr *ia) | |||
197 | * - the pages to be mapped must exist | 203 | * - the pages to be mapped must exist |
198 | * - the pages be physically contiguous in sequence | 204 | * - the pages be physically contiguous in sequence |
199 | */ | 205 | */ |
200 | unsigned long ramfs_nommu_get_unmapped_area(struct file *file, | 206 | static unsigned long ramfs_nommu_get_unmapped_area(struct file *file, |
201 | unsigned long addr, unsigned long len, | 207 | unsigned long addr, unsigned long len, |
202 | unsigned long pgoff, unsigned long flags) | 208 | unsigned long pgoff, unsigned long flags) |
203 | { | 209 | { |
@@ -256,7 +262,7 @@ out: | |||
256 | /* | 262 | /* |
257 | * set up a mapping for shared memory segments | 263 | * set up a mapping for shared memory segments |
258 | */ | 264 | */ |
259 | int ramfs_nommu_mmap(struct file *file, struct vm_area_struct *vma) | 265 | static int ramfs_nommu_mmap(struct file *file, struct vm_area_struct *vma) |
260 | { | 266 | { |
261 | if (!(vma->vm_flags & VM_SHARED)) | 267 | if (!(vma->vm_flags & VM_SHARED)) |
262 | return -ENOSYS; | 268 | return -ENOSYS; |
diff --git a/include/linux/ramfs.h b/include/linux/ramfs.h index 753207c8ce20..ecc730977a5a 100644 --- a/include/linux/ramfs.h +++ b/include/linux/ramfs.h | |||
@@ -14,13 +14,6 @@ ramfs_nommu_expand_for_mapping(struct inode *inode, size_t newsize) | |||
14 | } | 14 | } |
15 | #else | 15 | #else |
16 | extern int ramfs_nommu_expand_for_mapping(struct inode *inode, size_t newsize); | 16 | extern int ramfs_nommu_expand_for_mapping(struct inode *inode, size_t newsize); |
17 | extern unsigned long ramfs_nommu_get_unmapped_area(struct file *file, | ||
18 | unsigned long addr, | ||
19 | unsigned long len, | ||
20 | unsigned long pgoff, | ||
21 | unsigned long flags); | ||
22 | |||
23 | extern int ramfs_nommu_mmap(struct file *file, struct vm_area_struct *vma); | ||
24 | #endif | 17 | #endif |
25 | 18 | ||
26 | extern const struct file_operations ramfs_file_operations; | 19 | extern const struct file_operations ramfs_file_operations; |