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

Commit 41c4d25f authored by Jan Kara's avatar Jan Kara Committed by Al Viro
Browse files

mm: Update file times from fault path only if .page_mkwrite is not set 



Filesystems wanting to properly support freezing need to have control
when file_update_time() is called. After pushing file_update_time()
to all relevant .page_mkwrite implementations we can just stop calling
file_update_time() when filesystem implements .page_mkwrite.

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 14ae417c

mm/memory.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -2638,6 +2638,9 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma, 
		if (!page_mkwrite) {

		if (!page_mkwrite) {

			wait_on_page_locked(dirty_page);

			wait_on_page_locked(dirty_page);

			set_page_dirty_balance(dirty_page, page_mkwrite);

			set_page_dirty_balance(dirty_page, page_mkwrite);

			/* file_update_time outside page_lock */

			if (vma->vm_file)

				file_update_time(vma->vm_file);

		}

		}

		put_page(dirty_page);

		put_page(dirty_page);

		if (page_mkwrite) {

		if (page_mkwrite) {
@@ -2655,10 +2658,6 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma, 
			}

			}

		}

		}





		/* file_update_time outside page_lock */

		if (vma->vm_file)

			file_update_time(vma->vm_file);



		return ret;

		return ret;

	}

	}
@@ -3327,12 +3326,13 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma, 




	if (dirty_page) {

	if (dirty_page) {

		struct address_space *mapping = page->mapping;

		struct address_space *mapping = page->mapping;

		int dirtied = 0;





		if (set_page_dirty(dirty_page))

		if (set_page_dirty(dirty_page))

			page_mkwrite = 1;

			dirtied = 1;

		unlock_page(dirty_page);

		unlock_page(dirty_page);

		put_page(dirty_page);

		put_page(dirty_page);

		if (page_mkwrite && mapping) {

		if ((dirtied || page_mkwrite) && mapping) {

			/*

			/*

			 * Some device drivers do not set page.mapping but still

			 * Some device drivers do not set page.mapping but still

			 * dirty their pages

			 * dirty their pages
@@ -3341,7 +3341,7 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma, 
		}

		}





		/* file_update_time outside page_lock */

		/* file_update_time outside page_lock */

		if (vma->vm_file)

		if (vma->vm_file && !page_mkwrite)

			file_update_time(vma->vm_file);

			file_update_time(vma->vm_file);

	} else {

	} else {

		unlock_page(vmf.page);

		unlock_page(vmf.page);