diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-12-15 18:51:04 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2014-03-19 13:07:09 -0700 |
| commit | b86a4974e5b099be3e476931e361d526601061c1 (patch) | |
| tree | 01e32f88451a4eb77a2bbf7c5ff243840d5c7dcb /mm | |
| parent | c248d947237376e8afbb6c02e8ebb097f3d40a49 (diff) | |
ashmem: Add shmem_set_file to mm/shmem.c
NOT FOR STAGING
This patch re-adds the original shmem_set_file to mm/shmem.c
and converts ashmem.c back to using it.
CC: Brian Swetland <swetland@google.com>
CC: Colin Cross <ccross@android.com>
CC: Arve Hjønnevåg <arve@android.com>
CC: Dima Zavin <dima@android.com>
CC: Robert Love <rlove@google.com>
CC: Greg KH <greg@kroah.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/shmem.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index 1f18c9d0d93..9d0702c5011 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2990,6 +2990,14 @@ struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags } EXPORT_SYMBOL_GPL(shmem_file_setup); +void shmem_set_file(struct vm_area_struct *vma, struct file *file) +{ + if (vma->vm_file) + fput(vma->vm_file); + vma->vm_file = file; + vma->vm_ops = &shmem_vm_ops; +} + /** * shmem_zero_setup - setup a shared anonymous mapping * @vma: the vma to be mmapped is prepared by do_mmap_pgoff @@ -3003,10 +3011,7 @@ int shmem_zero_setup(struct vm_area_struct *vma) if (IS_ERR(file)) return PTR_ERR(file); - if (vma->vm_file) - fput(vma->vm_file); - vma->vm_file = file; - vma->vm_ops = &shmem_vm_ops; + shmem_set_file(vma, file); return 0; } |