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

Commit b43790ee authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Linus Torvalds
Browse files

mm: softdirty: don't forget to save file map softdiry bit on unmap 



pte_file_mksoft_dirty operates with argument passed by a value and
returns modified result thus we need to assign @ptfile here, otherwise
itis a no-op which may lead to loss of the softdirty bit.

Signed-off-by: default avatarCyrill Gorcunov <gorcunov@openvz.org>
Cc: Pavel Emelyanov <xemul@parallels.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0bf07331

mm/rmap.c

+1 −1
Original line number Diff line number Diff line
@@ -1361,7 +1361,7 @@ static int try_to_unmap_cluster(unsigned long cursor, unsigned int *mapcount, 
		if (page->index != linear_page_index(vma, address)) {

			pte_t ptfile = pgoff_to_pte(page->index);

			if (pte_soft_dirty(pteval))

				pte_file_mksoft_dirty(ptfile);

				ptfile = pte_file_mksoft_dirty(ptfile);

			set_pte_at(mm, address, pte, ptfile);

		}