diff options
| author |   Christian König <christian.koenig@amd.com> | 2020-11-05 17:05:35 +0100 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2020-11-05 17:08:43 +0100 |
| commit | e40b0b56ffdc16edce207904a7782da6a1a47162 (patch) | |
| tree | 53dfe71f25c1525d5b52474ec9d18460c2cc66fc /drivers/staging/android/ashmem.c | |
| parent | dma-buf: Fix static checker warning (diff) | |
| download | linux-dev-e40b0b56ffdc16edce207904a7782da6a1a47162.tar.xz linux-dev-e40b0b56ffdc16edce207904a7782da6a1a47162.zip | |
Revert "mm: introduce vma_set_file function v4"
The kernel test robot is not happy with that.
This reverts commit 2b5b95b1ff3d70a95013a45e3b5b90f1daf42348.
Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Daniel Vetter <daniel@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/394773/
Diffstat (limited to 'drivers/staging/android/ashmem.c')
| -rw-r--r-- | drivers/staging/android/ashmem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c index 4789d36ddfd3..10b4be1f3e78 100644 --- a/drivers/staging/android/ashmem.c +++ b/drivers/staging/android/ashmem.c @@ -450,9 +450,9 @@ static int ashmem_mmap(struct file *file, struct vm_area_struct *vma) vma_set_anonymous(vma); } - vma_set_file(vma, asma->file); - /* XXX: merge this with the get_file() above if possible */ - fput(asma->file); + if (vma->vm_file) + fput(vma->vm_file); + vma->vm_file = asma->file; out: mutex_unlock(&ashmem_mutex); |