Commit 5272d036 authored by Anton Altaparmakov's avatar Anton Altaparmakov Committed by Linus Torvalds
Browse files

ntfs: use find_get_page_flags() to mark page accessed as it is no longer marked later on 



Mel Gorman's commit 2457aec6 ("mm: non-atomically mark page accessed
during page cache allocation where possible") removed mark_page_accessed()
calls from NTFS without updating the matching find_lock_page() to
find_get_page_flags(GFP_LOCK | FGP_ACCESSED) thus causing the page to
never be marked accessed.

This patch fixes that.

Signed-off-by: default avatarAnton Altaparmakov <anton@tuxera.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2f82df0f

fs/ntfs/file.c

+3 −2
Original line number Diff line number Diff line 
/*

 * file.c - NTFS kernel file operations.  Part of the Linux-NTFS project.

 *

 * Copyright (c) 2001-2011 Anton Altaparmakov and Tuxera Inc.

 * Copyright (c) 2001-2014 Anton Altaparmakov and Tuxera Inc.

 *

 * This program/include file is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License as published
@@ -410,7 +410,8 @@ static inline int __ntfs_grab_cache_pages(struct address_space *mapping, 
	BUG_ON(!nr_pages);

	err = nr = 0;

	do {

		pages[nr] = find_lock_page(mapping, index);

		pages[nr] = find_get_page_flags(mapping, index, FGP_LOCK |

				FGP_ACCESSED);

		if (!pages[nr]) {

			if (!*cached_page) {

				*cached_page = page_cache_alloc(mapping);

fs/ntfs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -3208,7 +3208,7 @@ static void __exit exit_ntfs_fs(void) 
}



MODULE_AUTHOR("Anton Altaparmakov <anton@tuxera.com>");

MODULE_DESCRIPTION("NTFS 1.2/3.x driver - Copyright (c) 2001-2011 Anton Altaparmakov and Tuxera Inc.");

MODULE_DESCRIPTION("NTFS 1.2/3.x driver - Copyright (c) 2001-2014 Anton Altaparmakov and Tuxera Inc.");

MODULE_VERSION(NTFS_VERSION);

MODULE_LICENSE("GPL");

#ifdef DEBUG

CRA Git | Maintained and supported by SUSTech CRA and CCSE