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

Commit 4fcf1c62 authored by Jan Kara's avatar Jan Kara Committed by Al Viro
Browse files

mm: Make default vm_ops provide ->page_mkwrite handler 

Make default vm_ops provide ->page_mkwrite handler. Currently it only updates
file's modification times and gets locked page but later it will also handle
filesystem freezing.

BugLink: https://bugs.launchpad.net/bugs/897421


Tested-by: default avatarKamal Mostafa <kamal@canonical.com>
Tested-by: default avatarPeter M. Petrakis <peter.petrakis@canonical.com>
Tested-by: default avatarDann Frazier <dann.frazier@canonical.com>
Tested-by: default avatarMassimo Morana <massimo.morana@canonical.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 41c4d25f

include/linux/mm.h

+1 −0
Original line number Diff line number Diff line
@@ -1411,6 +1411,7 @@ extern void truncate_inode_pages_range(struct address_space *, 


/* generic vm_area_ops exported for stackable file systems */

extern int filemap_fault(struct vm_area_struct *, struct vm_fault *);

extern int filemap_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf);



/* mm/page-writeback.c */

int write_one_page(struct page *page, int wait);

mm/filemap.c

+19 −0
Original line number Diff line number Diff line
@@ -1712,8 +1712,27 @@ int filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 
}

EXPORT_SYMBOL(filemap_fault);



int filemap_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)

{

	struct page *page = vmf->page;

	struct inode *inode = vma->vm_file->f_path.dentry->d_inode;

	int ret = VM_FAULT_LOCKED;



	file_update_time(vma->vm_file);

	lock_page(page);

	if (page->mapping != inode->i_mapping) {

		unlock_page(page);

		ret = VM_FAULT_NOPAGE;

		goto out;

	}

out:

	return ret;

}

EXPORT_SYMBOL(filemap_page_mkwrite);



const struct vm_operations_struct generic_file_vm_ops = {

	.fault		= filemap_fault,

	.page_mkwrite	= filemap_page_mkwrite,

};



/* This is used for a general mmap of a disk file */

mm/filemap_xip.c

+1 −0
Original line number Diff line number Diff line
@@ -304,6 +304,7 @@ static int xip_file_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 


static const struct vm_operations_struct xip_file_vm_ops = {

	.fault	= xip_file_fault,

	.page_mkwrite	= filemap_page_mkwrite,

};



int xip_file_mmap(struct file * file, struct vm_area_struct * vma)