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

Commit bce0faa9 authored by Isaac J. Manjarres's avatar Isaac J. Manjarres
Browse files

Revert "ANDROID: sdcardfs: fault and page_mkwrite take only vmf" 



This reverts commit ab8e3036.
Revert for the sake of simplifying merge process.

Change-Id: I07d3f9964598d6c0166c172894d7f900a0b97ff3
Signed-off-by: default avatarIsaac J. Manjarres <isaacm@codeaurora.org>
parent ed814bc4

fs/sdcardfs/mmap.c

+7 −6
Original line number Diff line number Diff line
@@ -20,17 +20,17 @@ 


#include "sdcardfs.h"



static int sdcardfs_fault(struct vm_fault *vmf)

static int sdcardfs_fault(struct vm_area_struct *vma, struct vm_fault *vmf)

{

	int err;

	struct file *file;

	const struct vm_operations_struct *lower_vm_ops;



	file = (struct file *)vmf->vma->vm_private_data;

	file = (struct file *)vma->vm_private_data;

	lower_vm_ops = SDCARDFS_F(file)->lower_vm_ops;

	BUG_ON(!lower_vm_ops);



	err = lower_vm_ops->fault(vmf);

	err = lower_vm_ops->fault(vma, vmf);

	return err;

}
@@ -48,19 +48,20 @@ static void sdcardfs_vm_close(struct vm_area_struct *vma) 
	fput(file);

}



static int sdcardfs_page_mkwrite(struct vm_fault *vmf)

static int sdcardfs_page_mkwrite(struct vm_area_struct *vma,

			       struct vm_fault *vmf)

{

	int err = 0;

	struct file *file;

	const struct vm_operations_struct *lower_vm_ops;



	file = (struct file *)vmf->vma->vm_private_data;

	file = (struct file *)vma->vm_private_data;

	lower_vm_ops = SDCARDFS_F(file)->lower_vm_ops;

	BUG_ON(!lower_vm_ops);

	if (!lower_vm_ops->page_mkwrite)

		goto out;



	err = lower_vm_ops->page_mkwrite(vmf);

	err = lower_vm_ops->page_mkwrite(vma, vmf);

out:

	return err;

}