rev |
line source |
shann@25629
|
1 SPDX-License-Identifier: GPL-2.0
|
shann@25629
|
2 aufs4.19 mmap patch
|
shann@25629
|
3
|
shann@25629
|
4 diff --git a/fs/proc/base.c b/fs/proc/base.c
|
shann@25629
|
5 index 7e9f07bf260d2..3ab59011067ee 100644
|
shann@25629
|
6 --- a/fs/proc/base.c
|
shann@25629
|
7 +++ b/fs/proc/base.c
|
shann@25629
|
8 @@ -2016,7 +2016,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
|
shann@25629
|
9 down_read(&mm->mmap_sem);
|
shann@25629
|
10 vma = find_exact_vma(mm, vm_start, vm_end);
|
shann@25629
|
11 if (vma && vma->vm_file) {
|
shann@25629
|
12 - *path = vma->vm_file->f_path;
|
shann@25629
|
13 + *path = vma_pr_or_file(vma)->f_path;
|
shann@25629
|
14 path_get(path);
|
shann@25629
|
15 rc = 0;
|
shann@25629
|
16 }
|
shann@25629
|
17 diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
|
shann@25629
|
18 index 3b63be64e4364..fb9913bf3d10d 100644
|
shann@25629
|
19 --- a/fs/proc/nommu.c
|
shann@25629
|
20 +++ b/fs/proc/nommu.c
|
shann@25629
|
21 @@ -45,7 +45,10 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
|
shann@25629
|
22 file = region->vm_file;
|
shann@25629
|
23
|
shann@25629
|
24 if (file) {
|
shann@25629
|
25 - struct inode *inode = file_inode(region->vm_file);
|
shann@25629
|
26 + struct inode *inode;
|
shann@25629
|
27 +
|
shann@25629
|
28 + file = vmr_pr_or_file(region);
|
shann@25629
|
29 + inode = file_inode(file);
|
shann@25629
|
30 dev = inode->i_sb->s_dev;
|
shann@25629
|
31 ino = inode->i_ino;
|
shann@25629
|
32 }
|
shann@25629
|
33 diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
|
shann@25629
|
34 index 5ea1d64cb0b4c..7865a4707d233 100644
|
shann@25629
|
35 --- a/fs/proc/task_mmu.c
|
shann@25629
|
36 +++ b/fs/proc/task_mmu.c
|
shann@25629
|
37 @@ -305,7 +305,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
|
shann@25629
|
38 const char *name = NULL;
|
shann@25629
|
39
|
shann@25629
|
40 if (file) {
|
shann@25629
|
41 - struct inode *inode = file_inode(vma->vm_file);
|
shann@25629
|
42 + struct inode *inode;
|
shann@25629
|
43 +
|
shann@25629
|
44 + file = vma_pr_or_file(vma);
|
shann@25629
|
45 + inode = file_inode(file);
|
shann@25629
|
46 dev = inode->i_sb->s_dev;
|
shann@25629
|
47 ino = inode->i_ino;
|
shann@25629
|
48 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
|
shann@25629
|
49 @@ -1727,7 +1730,7 @@ static int show_numa_map(struct seq_file *m, void *v)
|
shann@25629
|
50 struct proc_maps_private *proc_priv = &numa_priv->proc_maps;
|
shann@25629
|
51 struct vm_area_struct *vma = v;
|
shann@25629
|
52 struct numa_maps *md = &numa_priv->md;
|
shann@25629
|
53 - struct file *file = vma->vm_file;
|
shann@25629
|
54 + struct file *file = vma_pr_or_file(vma);
|
shann@25629
|
55 struct mm_struct *mm = vma->vm_mm;
|
shann@25629
|
56 struct mm_walk walk = {
|
shann@25629
|
57 .hugetlb_entry = gather_hugetlb_stats,
|
shann@25629
|
58 diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
|
shann@25629
|
59 index 0b63d68dedb2a..400d1c594ceb3 100644
|
shann@25629
|
60 --- a/fs/proc/task_nommu.c
|
shann@25629
|
61 +++ b/fs/proc/task_nommu.c
|
shann@25629
|
62 @@ -155,7 +155,10 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma)
|
shann@25629
|
63 file = vma->vm_file;
|
shann@25629
|
64
|
shann@25629
|
65 if (file) {
|
shann@25629
|
66 - struct inode *inode = file_inode(vma->vm_file);
|
shann@25629
|
67 + struct inode *inode;
|
shann@25629
|
68 +
|
shann@25629
|
69 + file = vma_pr_or_file(vma);
|
shann@25629
|
70 + inode = file_inode(file);
|
shann@25629
|
71 dev = inode->i_sb->s_dev;
|
shann@25629
|
72 ino = inode->i_ino;
|
shann@25629
|
73 pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT;
|
shann@25629
|
74 diff --git a/include/linux/mm.h b/include/linux/mm.h
|
shann@25629
|
75 index 0416a7204be37..4a298a92681bb 100644
|
shann@25629
|
76 --- a/include/linux/mm.h
|
shann@25629
|
77 +++ b/include/linux/mm.h
|
shann@25629
|
78 @@ -1440,6 +1440,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
|
shann@25629
|
79 unmap_mapping_range(mapping, holebegin, holelen, 0);
|
shann@25629
|
80 }
|
shann@25629
|
81
|
shann@25629
|
82 +extern void vma_do_file_update_time(struct vm_area_struct *, const char[], int);
|
shann@25629
|
83 +extern struct file *vma_do_pr_or_file(struct vm_area_struct *, const char[],
|
shann@25629
|
84 + int);
|
shann@25629
|
85 +extern void vma_do_get_file(struct vm_area_struct *, const char[], int);
|
shann@25629
|
86 +extern void vma_do_fput(struct vm_area_struct *, const char[], int);
|
shann@25629
|
87 +
|
shann@25629
|
88 +#define vma_file_update_time(vma) vma_do_file_update_time(vma, __func__, \
|
shann@25629
|
89 + __LINE__)
|
shann@25629
|
90 +#define vma_pr_or_file(vma) vma_do_pr_or_file(vma, __func__, \
|
shann@25629
|
91 + __LINE__)
|
shann@25629
|
92 +#define vma_get_file(vma) vma_do_get_file(vma, __func__, __LINE__)
|
shann@25629
|
93 +#define vma_fput(vma) vma_do_fput(vma, __func__, __LINE__)
|
shann@25629
|
94 +
|
shann@25629
|
95 +#ifndef CONFIG_MMU
|
shann@25629
|
96 +extern struct file *vmr_do_pr_or_file(struct vm_region *, const char[], int);
|
shann@25629
|
97 +extern void vmr_do_fput(struct vm_region *, const char[], int);
|
shann@25629
|
98 +
|
shann@25629
|
99 +#define vmr_pr_or_file(region) vmr_do_pr_or_file(region, __func__, \
|
shann@25629
|
100 + __LINE__)
|
shann@25629
|
101 +#define vmr_fput(region) vmr_do_fput(region, __func__, __LINE__)
|
shann@25629
|
102 +#endif /* !CONFIG_MMU */
|
shann@25629
|
103 +
|
shann@25629
|
104 extern int access_process_vm(struct task_struct *tsk, unsigned long addr,
|
shann@25629
|
105 void *buf, int len, unsigned int gup_flags);
|
shann@25629
|
106 extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
|
shann@25629
|
107 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
|
shann@25629
|
108 index 5ed8f6292a533..01229754077f6 100644
|
shann@25629
|
109 --- a/include/linux/mm_types.h
|
shann@25629
|
110 +++ b/include/linux/mm_types.h
|
shann@25629
|
111 @@ -239,6 +239,7 @@ struct vm_region {
|
shann@25629
|
112 unsigned long vm_top; /* region allocated to here */
|
shann@25629
|
113 unsigned long vm_pgoff; /* the offset in vm_file corresponding to vm_start */
|
shann@25629
|
114 struct file *vm_file; /* the backing file or NULL */
|
shann@25629
|
115 + struct file *vm_prfile; /* the virtual backing file or NULL */
|
shann@25629
|
116
|
shann@25629
|
117 int vm_usage; /* region usage count (access under nommu_region_sem) */
|
shann@25629
|
118 bool vm_icache_flushed : 1; /* true if the icache has been flushed for
|
shann@25629
|
119 @@ -313,6 +314,7 @@ struct vm_area_struct {
|
shann@25629
|
120 unsigned long vm_pgoff; /* Offset (within vm_file) in PAGE_SIZE
|
shann@25629
|
121 units */
|
shann@25629
|
122 struct file * vm_file; /* File we map to (can be NULL). */
|
shann@25629
|
123 + struct file *vm_prfile; /* shadow of vm_file */
|
shann@25629
|
124 void * vm_private_data; /* was vm_pte (shared mem) */
|
shann@25629
|
125
|
shann@25629
|
126 atomic_long_t swap_readahead_info;
|
shann@25629
|
127 diff --git a/kernel/fork.c b/kernel/fork.c
|
shann@25629
|
128 index f0b58479534f0..fa562c364d020 100644
|
shann@25629
|
129 --- a/kernel/fork.c
|
shann@25629
|
130 +++ b/kernel/fork.c
|
shann@25629
|
131 @@ -505,7 +505,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
|
shann@25629
|
132 struct inode *inode = file_inode(file);
|
shann@25629
|
133 struct address_space *mapping = file->f_mapping;
|
shann@25629
|
134
|
shann@25629
|
135 - get_file(file);
|
shann@25629
|
136 + vma_get_file(tmp);
|
shann@25629
|
137 if (tmp->vm_flags & VM_DENYWRITE)
|
shann@25629
|
138 atomic_dec(&inode->i_writecount);
|
shann@25629
|
139 i_mmap_lock_write(mapping);
|
shann@25629
|
140 diff --git a/mm/Makefile b/mm/Makefile
|
shann@25629
|
141 index 26ef77a3883b5..b2869af1ef08e 100644
|
shann@25629
|
142 --- a/mm/Makefile
|
shann@25629
|
143 +++ b/mm/Makefile
|
shann@25629
|
144 @@ -39,7 +39,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \
|
shann@25629
|
145 mm_init.o mmu_context.o percpu.o slab_common.o \
|
shann@25629
|
146 compaction.o vmacache.o \
|
shann@25629
|
147 interval_tree.o list_lru.o workingset.o \
|
shann@25629
|
148 - debug.o $(mmu-y)
|
shann@25629
|
149 + prfile.o debug.o $(mmu-y)
|
shann@25629
|
150
|
shann@25629
|
151 obj-y += init-mm.o
|
shann@25629
|
152
|
shann@25629
|
153 diff --git a/mm/filemap.c b/mm/filemap.c
|
shann@25629
|
154 index 52517f28e6f4a..250f675dcfb28 100644
|
shann@25629
|
155 --- a/mm/filemap.c
|
shann@25629
|
156 +++ b/mm/filemap.c
|
shann@25629
|
157 @@ -2700,7 +2700,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
|
shann@25629
|
158 vm_fault_t ret = VM_FAULT_LOCKED;
|
shann@25629
|
159
|
shann@25629
|
160 sb_start_pagefault(inode->i_sb);
|
shann@25629
|
161 - file_update_time(vmf->vma->vm_file);
|
shann@25629
|
162 + vma_file_update_time(vmf->vma);
|
shann@25629
|
163 lock_page(page);
|
shann@25629
|
164 if (page->mapping != inode->i_mapping) {
|
shann@25629
|
165 unlock_page(page);
|
shann@25629
|
166 diff --git a/mm/mmap.c b/mm/mmap.c
|
shann@25629
|
167 index f7cd9cb966c0f..515e88a194bd0 100644
|
shann@25629
|
168 --- a/mm/mmap.c
|
shann@25629
|
169 +++ b/mm/mmap.c
|
shann@25629
|
170 @@ -180,7 +180,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
|
shann@25629
|
171 if (vma->vm_ops && vma->vm_ops->close)
|
shann@25629
|
172 vma->vm_ops->close(vma);
|
shann@25629
|
173 if (vma->vm_file)
|
shann@25629
|
174 - fput(vma->vm_file);
|
shann@25629
|
175 + vma_fput(vma);
|
shann@25629
|
176 mpol_put(vma_policy(vma));
|
shann@25629
|
177 vm_area_free(vma);
|
shann@25629
|
178 return next;
|
shann@25629
|
179 @@ -905,7 +905,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start,
|
shann@25629
|
180 if (remove_next) {
|
shann@25629
|
181 if (file) {
|
shann@25629
|
182 uprobe_munmap(next, next->vm_start, next->vm_end);
|
shann@25629
|
183 - fput(file);
|
shann@25629
|
184 + vma_fput(vma);
|
shann@25629
|
185 }
|
shann@25629
|
186 if (next->anon_vma)
|
shann@25629
|
187 anon_vma_merge(vma, next);
|
shann@25629
|
188 @@ -1821,8 +1821,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
|
shann@25629
|
189 return addr;
|
shann@25629
|
190
|
shann@25629
|
191 unmap_and_free_vma:
|
shann@25629
|
192 + vma_fput(vma);
|
shann@25629
|
193 vma->vm_file = NULL;
|
shann@25629
|
194 - fput(file);
|
shann@25629
|
195
|
shann@25629
|
196 /* Undo any partial mapping done by a device driver. */
|
shann@25629
|
197 unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
|
shann@25629
|
198 @@ -2641,7 +2641,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
|
shann@25629
|
199 goto out_free_mpol;
|
shann@25629
|
200
|
shann@25629
|
201 if (new->vm_file)
|
shann@25629
|
202 - get_file(new->vm_file);
|
shann@25629
|
203 + vma_get_file(new);
|
shann@25629
|
204
|
shann@25629
|
205 if (new->vm_ops && new->vm_ops->open)
|
shann@25629
|
206 new->vm_ops->open(new);
|
shann@25629
|
207 @@ -2660,7 +2660,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
|
shann@25629
|
208 if (new->vm_ops && new->vm_ops->close)
|
shann@25629
|
209 new->vm_ops->close(new);
|
shann@25629
|
210 if (new->vm_file)
|
shann@25629
|
211 - fput(new->vm_file);
|
shann@25629
|
212 + vma_fput(new);
|
shann@25629
|
213 unlink_anon_vmas(new);
|
shann@25629
|
214 out_free_mpol:
|
shann@25629
|
215 mpol_put(vma_policy(new));
|
shann@25629
|
216 @@ -2822,7 +2822,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
|
shann@25629
|
217 struct vm_area_struct *vma;
|
shann@25629
|
218 unsigned long populate = 0;
|
shann@25629
|
219 unsigned long ret = -EINVAL;
|
shann@25629
|
220 - struct file *file;
|
shann@25629
|
221 + struct file *file, *prfile;
|
shann@25629
|
222
|
shann@25629
|
223 pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.rst.\n",
|
shann@25629
|
224 current->comm, current->pid);
|
shann@25629
|
225 @@ -2897,10 +2897,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
|
shann@25629
|
226 }
|
shann@25629
|
227 }
|
shann@25629
|
228
|
shann@25629
|
229 - file = get_file(vma->vm_file);
|
shann@25629
|
230 + vma_get_file(vma);
|
shann@25629
|
231 + file = vma->vm_file;
|
shann@25629
|
232 + prfile = vma->vm_prfile;
|
shann@25629
|
233 ret = do_mmap_pgoff(vma->vm_file, start, size,
|
shann@25629
|
234 prot, flags, pgoff, &populate, NULL);
|
shann@25629
|
235 + if (!IS_ERR_VALUE(ret) && file && prfile) {
|
shann@25629
|
236 + struct vm_area_struct *new_vma;
|
shann@25629
|
237 +
|
shann@25629
|
238 + new_vma = find_vma(mm, ret);
|
shann@25629
|
239 + if (!new_vma->vm_prfile)
|
shann@25629
|
240 + new_vma->vm_prfile = prfile;
|
shann@25629
|
241 + if (new_vma != vma)
|
shann@25629
|
242 + get_file(prfile);
|
shann@25629
|
243 + }
|
shann@25629
|
244 + /*
|
shann@25629
|
245 + * two fput()s instead of vma_fput(vma),
|
shann@25629
|
246 + * coz vma may not be available anymore.
|
shann@25629
|
247 + */
|
shann@25629
|
248 fput(file);
|
shann@25629
|
249 + if (prfile)
|
shann@25629
|
250 + fput(prfile);
|
shann@25629
|
251 out:
|
shann@25629
|
252 up_write(&mm->mmap_sem);
|
shann@25629
|
253 if (populate)
|
shann@25629
|
254 @@ -3206,7 +3223,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
|
shann@25629
|
255 if (anon_vma_clone(new_vma, vma))
|
shann@25629
|
256 goto out_free_mempol;
|
shann@25629
|
257 if (new_vma->vm_file)
|
shann@25629
|
258 - get_file(new_vma->vm_file);
|
shann@25629
|
259 + vma_get_file(new_vma);
|
shann@25629
|
260 if (new_vma->vm_ops && new_vma->vm_ops->open)
|
shann@25629
|
261 new_vma->vm_ops->open(new_vma);
|
shann@25629
|
262 vma_link(mm, new_vma, prev, rb_link, rb_parent);
|
shann@25629
|
263 diff --git a/mm/nommu.c b/mm/nommu.c
|
shann@25629
|
264 index e4aac33216aec..83bfcd1528a00 100644
|
shann@25629
|
265 --- a/mm/nommu.c
|
shann@25629
|
266 +++ b/mm/nommu.c
|
shann@25629
|
267 @@ -625,7 +625,7 @@ static void __put_nommu_region(struct vm_region *region)
|
shann@25629
|
268 up_write(&nommu_region_sem);
|
shann@25629
|
269
|
shann@25629
|
270 if (region->vm_file)
|
shann@25629
|
271 - fput(region->vm_file);
|
shann@25629
|
272 + vmr_fput(region);
|
shann@25629
|
273
|
shann@25629
|
274 /* IO memory and memory shared directly out of the pagecache
|
shann@25629
|
275 * from ramfs/tmpfs mustn't be released here */
|
shann@25629
|
276 @@ -763,7 +763,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
|
shann@25629
|
277 if (vma->vm_ops && vma->vm_ops->close)
|
shann@25629
|
278 vma->vm_ops->close(vma);
|
shann@25629
|
279 if (vma->vm_file)
|
shann@25629
|
280 - fput(vma->vm_file);
|
shann@25629
|
281 + vma_fput(vma);
|
shann@25629
|
282 put_nommu_region(vma->vm_region);
|
shann@25629
|
283 vm_area_free(vma);
|
shann@25629
|
284 }
|
shann@25629
|
285 @@ -1286,7 +1286,7 @@ unsigned long do_mmap(struct file *file,
|
shann@25629
|
286 goto error_just_free;
|
shann@25629
|
287 }
|
shann@25629
|
288 }
|
shann@25629
|
289 - fput(region->vm_file);
|
shann@25629
|
290 + vmr_fput(region);
|
shann@25629
|
291 kmem_cache_free(vm_region_jar, region);
|
shann@25629
|
292 region = pregion;
|
shann@25629
|
293 result = start;
|
shann@25629
|
294 @@ -1361,10 +1361,10 @@ unsigned long do_mmap(struct file *file,
|
shann@25629
|
295 up_write(&nommu_region_sem);
|
shann@25629
|
296 error:
|
shann@25629
|
297 if (region->vm_file)
|
shann@25629
|
298 - fput(region->vm_file);
|
shann@25629
|
299 + vmr_fput(region);
|
shann@25629
|
300 kmem_cache_free(vm_region_jar, region);
|
shann@25629
|
301 if (vma->vm_file)
|
shann@25629
|
302 - fput(vma->vm_file);
|
shann@25629
|
303 + vma_fput(vma);
|
shann@25629
|
304 vm_area_free(vma);
|
shann@25629
|
305 return ret;
|
shann@25629
|
306
|
shann@25629
|
307 diff --git a/mm/prfile.c b/mm/prfile.c
|
shann@25629
|
308 new file mode 100644
|
shann@25629
|
309 index 0000000000000..00d51187c3250
|
shann@25629
|
310 --- /dev/null
|
shann@25629
|
311 +++ b/mm/prfile.c
|
shann@25629
|
312 @@ -0,0 +1,86 @@
|
shann@25629
|
313 +// SPDX-License-Identifier: GPL-2.0
|
shann@25629
|
314 +/*
|
shann@25629
|
315 + * Mainly for aufs which mmap(2) different file and wants to print different
|
shann@25629
|
316 + * path in /proc/PID/maps.
|
shann@25629
|
317 + * Call these functions via macros defined in linux/mm.h.
|
shann@25629
|
318 + *
|
shann@25629
|
319 + * See Documentation/filesystems/aufs/design/06mmap.txt
|
shann@25629
|
320 + *
|
shann@25629
|
321 + * Copyright (c) 2014-2020 Junjro R. Okajima
|
shann@25629
|
322 + * Copyright (c) 2014 Ian Campbell
|
shann@25629
|
323 + */
|
shann@25629
|
324 +
|
shann@25629
|
325 +#include <linux/mm.h>
|
shann@25629
|
326 +#include <linux/file.h>
|
shann@25629
|
327 +#include <linux/fs.h>
|
shann@25629
|
328 +
|
shann@25629
|
329 +/* #define PRFILE_TRACE */
|
shann@25629
|
330 +static inline void prfile_trace(struct file *f, struct file *pr,
|
shann@25629
|
331 + const char func[], int line, const char func2[])
|
shann@25629
|
332 +{
|
shann@25629
|
333 +#ifdef PRFILE_TRACE
|
shann@25629
|
334 + if (pr)
|
shann@25629
|
335 + pr_info("%s:%d: %s, %pD2\n", func, line, func2, f);
|
shann@25629
|
336 +#endif
|
shann@25629
|
337 +}
|
shann@25629
|
338 +
|
shann@25629
|
339 +void vma_do_file_update_time(struct vm_area_struct *vma, const char func[],
|
shann@25629
|
340 + int line)
|
shann@25629
|
341 +{
|
shann@25629
|
342 + struct file *f = vma->vm_file, *pr = vma->vm_prfile;
|
shann@25629
|
343 +
|
shann@25629
|
344 + prfile_trace(f, pr, func, line, __func__);
|
shann@25629
|
345 + file_update_time(f);
|
shann@25629
|
346 + if (f && pr)
|
shann@25629
|
347 + file_update_time(pr);
|
shann@25629
|
348 +}
|
shann@25629
|
349 +
|
shann@25629
|
350 +struct file *vma_do_pr_or_file(struct vm_area_struct *vma, const char func[],
|
shann@25629
|
351 + int line)
|
shann@25629
|
352 +{
|
shann@25629
|
353 + struct file *f = vma->vm_file, *pr = vma->vm_prfile;
|
shann@25629
|
354 +
|
shann@25629
|
355 + prfile_trace(f, pr, func, line, __func__);
|
shann@25629
|
356 + return (f && pr) ? pr : f;
|
shann@25629
|
357 +}
|
shann@25629
|
358 +
|
shann@25629
|
359 +void vma_do_get_file(struct vm_area_struct *vma, const char func[], int line)
|
shann@25629
|
360 +{
|
shann@25629
|
361 + struct file *f = vma->vm_file, *pr = vma->vm_prfile;
|
shann@25629
|
362 +
|
shann@25629
|
363 + prfile_trace(f, pr, func, line, __func__);
|
shann@25629
|
364 + get_file(f);
|
shann@25629
|
365 + if (f && pr)
|
shann@25629
|
366 + get_file(pr);
|
shann@25629
|
367 +}
|
shann@25629
|
368 +
|
shann@25629
|
369 +void vma_do_fput(struct vm_area_struct *vma, const char func[], int line)
|
shann@25629
|
370 +{
|
shann@25629
|
371 + struct file *f = vma->vm_file, *pr = vma->vm_prfile;
|
shann@25629
|
372 +
|
shann@25629
|
373 + prfile_trace(f, pr, func, line, __func__);
|
shann@25629
|
374 + fput(f);
|
shann@25629
|
375 + if (f && pr)
|
shann@25629
|
376 + fput(pr);
|
shann@25629
|
377 +}
|
shann@25629
|
378 +
|
shann@25629
|
379 +#ifndef CONFIG_MMU
|
shann@25629
|
380 +struct file *vmr_do_pr_or_file(struct vm_region *region, const char func[],
|
shann@25629
|
381 + int line)
|
shann@25629
|
382 +{
|
shann@25629
|
383 + struct file *f = region->vm_file, *pr = region->vm_prfile;
|
shann@25629
|
384 +
|
shann@25629
|
385 + prfile_trace(f, pr, func, line, __func__);
|
shann@25629
|
386 + return (f && pr) ? pr : f;
|
shann@25629
|
387 +}
|
shann@25629
|
388 +
|
shann@25629
|
389 +void vmr_do_fput(struct vm_region *region, const char func[], int line)
|
shann@25629
|
390 +{
|
shann@25629
|
391 + struct file *f = region->vm_file, *pr = region->vm_prfile;
|
shann@25629
|
392 +
|
shann@25629
|
393 + prfile_trace(f, pr, func, line, __func__);
|
shann@25629
|
394 + fput(f);
|
shann@25629
|
395 + if (f && pr)
|
shann@25629
|
396 + fput(pr);
|
shann@25629
|
397 +}
|
shann@25629
|
398 +#endif /* !CONFIG_MMU */
|