Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebfc8d64 authored by John Stultz's avatar John Stultz Committed by Amit Pundir
Browse files

ANDROID: 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.

Change-Id: Ie604c9f8f4d0ee6bc2aae1a96d261c8373a1a2dc
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: default avatarJohn Stultz <john.stultz@linaro.org>
parent f9cbd12e

drivers/staging/android/ashmem.c

+6 −14
Original line number Diff line number Diff line
@@ -401,21 +401,13 @@ static int ashmem_mmap(struct file *file, struct vm_area_struct *vma) 
	}

	get_file(asma->file);



	/*

	 * XXX - Reworked to use shmem_zero_setup() instead of

	 * shmem_set_file while we're in staging. -jstultz

	 */

	if (vma->vm_flags & VM_SHARED) {

		ret = shmem_zero_setup(vma);

		if (ret) {

			fput(asma->file);

			goto out;

		}

	}



	if (vma->vm_flags & VM_SHARED)

		shmem_set_file(vma, asma->file);

	else {

		if (vma->vm_file)

			fput(vma->vm_file);

		vma->vm_file = asma->file;

	}



out:

	mutex_unlock(&ashmem_mutex);

include/linux/mm.h

+2 −0
Original line number Diff line number Diff line
@@ -1222,6 +1222,8 @@ extern void pagefault_out_of_memory(void); 


extern void show_free_areas(unsigned int flags, nodemask_t *nodemask);



void shmem_set_file(struct vm_area_struct *vma, struct file *file);



extern bool can_do_mlock(void);

extern int user_shm_lock(size_t, struct user_struct *);

extern void user_shm_unlock(size_t, struct user_struct *);

mm/shmem.c

+9 −4
Original line number Diff line number Diff line
@@ -4266,6 +4266,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
@@ -4285,10 +4293,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);



	if (IS_ENABLED(CONFIG_TRANSPARENT_HUGE_PAGECACHE) &&

			((vma->vm_start + ~HPAGE_PMD_MASK) & HPAGE_PMD_MASK) <