diff options
-rw-r--r-- | mm/shmem.c | 25 | ||||
-rw-r--r-- | mm/tiny-shmem.c | 8 |
2 files changed, 13 insertions, 20 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index 3372bc579e89..f514dd392cd9 100644 --- a/mm/shmem.c +++ b/mm/shmem.c | |||
@@ -244,9 +244,8 @@ static void shmem_free_inode(struct super_block *sb) | |||
244 | } | 244 | } |
245 | } | 245 | } |
246 | 246 | ||
247 | /* | 247 | /** |
248 | * shmem_recalc_inode - recalculate the size of an inode | 248 | * shmem_recalc_inode - recalculate the size of an inode |
249 | * | ||
250 | * @inode: inode to recalc | 249 | * @inode: inode to recalc |
251 | * | 250 | * |
252 | * We have to calculate the free blocks since the mm can drop | 251 | * We have to calculate the free blocks since the mm can drop |
@@ -270,9 +269,8 @@ static void shmem_recalc_inode(struct inode *inode) | |||
270 | } | 269 | } |
271 | } | 270 | } |
272 | 271 | ||
273 | /* | 272 | /** |
274 | * shmem_swp_entry - find the swap vector position in the info structure | 273 | * shmem_swp_entry - find the swap vector position in the info structure |
275 | * | ||
276 | * @info: info structure for the inode | 274 | * @info: info structure for the inode |
277 | * @index: index of the page to find | 275 | * @index: index of the page to find |
278 | * @page: optional page to add to the structure. Has to be preset to | 276 | * @page: optional page to add to the structure. Has to be preset to |
@@ -374,13 +372,13 @@ static void shmem_swp_set(struct shmem_inode_info *info, swp_entry_t *entry, uns | |||
374 | } | 372 | } |
375 | } | 373 | } |
376 | 374 | ||
377 | /* | 375 | /** |
378 | * shmem_swp_alloc - get the position of the swap entry for the page. | 376 | * shmem_swp_alloc - get the position of the swap entry for the page. |
379 | * If it does not exist allocate the entry. | ||
380 | * | ||
381 | * @info: info structure for the inode | 377 | * @info: info structure for the inode |
382 | * @index: index of the page to find | 378 | * @index: index of the page to find |
383 | * @sgp: check and recheck i_size? skip allocation? | 379 | * @sgp: check and recheck i_size? skip allocation? |
380 | * | ||
381 | * If the entry does not exist, allocate it. | ||
384 | */ | 382 | */ |
385 | static swp_entry_t *shmem_swp_alloc(struct shmem_inode_info *info, unsigned long index, enum sgp_type sgp) | 383 | static swp_entry_t *shmem_swp_alloc(struct shmem_inode_info *info, unsigned long index, enum sgp_type sgp) |
386 | { | 384 | { |
@@ -440,9 +438,8 @@ static swp_entry_t *shmem_swp_alloc(struct shmem_inode_info *info, unsigned long | |||
440 | return entry; | 438 | return entry; |
441 | } | 439 | } |
442 | 440 | ||
443 | /* | 441 | /** |
444 | * shmem_free_swp - free some swap entries in a directory | 442 | * shmem_free_swp - free some swap entries in a directory |
445 | * | ||
446 | * @dir: pointer to the directory | 443 | * @dir: pointer to the directory |
447 | * @edir: pointer after last entry of the directory | 444 | * @edir: pointer after last entry of the directory |
448 | * @punch_lock: pointer to spinlock when needed for the holepunch case | 445 | * @punch_lock: pointer to spinlock when needed for the holepunch case |
@@ -2022,7 +2019,7 @@ static const struct inode_operations shmem_symlink_inode_operations = { | |||
2022 | }; | 2019 | }; |
2023 | 2020 | ||
2024 | #ifdef CONFIG_TMPFS_POSIX_ACL | 2021 | #ifdef CONFIG_TMPFS_POSIX_ACL |
2025 | /** | 2022 | /* |
2026 | * Superblocks without xattr inode operations will get security.* xattr | 2023 | * Superblocks without xattr inode operations will get security.* xattr |
2027 | * support from the VFS "for free". As soon as we have any other xattrs | 2024 | * support from the VFS "for free". As soon as we have any other xattrs |
2028 | * like ACLs, we also need to implement the security.* handlers at | 2025 | * like ACLs, we also need to implement the security.* handlers at |
@@ -2561,12 +2558,11 @@ out4: | |||
2561 | } | 2558 | } |
2562 | module_init(init_tmpfs) | 2559 | module_init(init_tmpfs) |
2563 | 2560 | ||
2564 | /* | 2561 | /** |
2565 | * shmem_file_setup - get an unlinked file living in tmpfs | 2562 | * shmem_file_setup - get an unlinked file living in tmpfs |
2566 | * | ||
2567 | * @name: name for dentry (to be seen in /proc/<pid>/maps | 2563 | * @name: name for dentry (to be seen in /proc/<pid>/maps |
2568 | * @size: size to be set for the file | 2564 | * @size: size to be set for the file |
2569 | * | 2565 | * @flags: vm_flags |
2570 | */ | 2566 | */ |
2571 | struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags) | 2567 | struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags) |
2572 | { | 2568 | { |
@@ -2621,9 +2617,8 @@ put_memory: | |||
2621 | return ERR_PTR(error); | 2617 | return ERR_PTR(error); |
2622 | } | 2618 | } |
2623 | 2619 | ||
2624 | /* | 2620 | /** |
2625 | * shmem_zero_setup - setup a shared anonymous mapping | 2621 | * shmem_zero_setup - setup a shared anonymous mapping |
2626 | * | ||
2627 | * @vma: the vma to be mmapped is prepared by do_mmap_pgoff | 2622 | * @vma: the vma to be mmapped is prepared by do_mmap_pgoff |
2628 | */ | 2623 | */ |
2629 | int shmem_zero_setup(struct vm_area_struct *vma) | 2624 | int shmem_zero_setup(struct vm_area_struct *vma) |
diff --git a/mm/tiny-shmem.c b/mm/tiny-shmem.c index 702083638c16..f0f55875dd6a 100644 --- a/mm/tiny-shmem.c +++ b/mm/tiny-shmem.c | |||
@@ -39,12 +39,11 @@ static int __init init_tmpfs(void) | |||
39 | } | 39 | } |
40 | module_init(init_tmpfs) | 40 | module_init(init_tmpfs) |
41 | 41 | ||
42 | /* | 42 | /** |
43 | * shmem_file_setup - get an unlinked file living in tmpfs | 43 | * shmem_file_setup - get an unlinked file living in tmpfs |
44 | * | ||
45 | * @name: name for dentry (to be seen in /proc/<pid>/maps | 44 | * @name: name for dentry (to be seen in /proc/<pid>/maps |
46 | * @size: size to be set for the file | 45 | * @size: size to be set for the file |
47 | * | 46 | * @flags: vm_flags |
48 | */ | 47 | */ |
49 | struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags) | 48 | struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags) |
50 | { | 49 | { |
@@ -95,9 +94,8 @@ put_memory: | |||
95 | return ERR_PTR(error); | 94 | return ERR_PTR(error); |
96 | } | 95 | } |
97 | 96 | ||
98 | /* | 97 | /** |
99 | * shmem_zero_setup - setup a shared anonymous mapping | 98 | * shmem_zero_setup - setup a shared anonymous mapping |
100 | * | ||
101 | * @vma: the vma to be mmapped is prepared by do_mmap_pgoff | 99 | * @vma: the vma to be mmapped is prepared by do_mmap_pgoff |
102 | */ | 100 | */ |
103 | int shmem_zero_setup(struct vm_area_struct *vma) | 101 | int shmem_zero_setup(struct vm_area_struct *vma) |