diff options
author | Anton Altaparmakov <anton@tuxera.com> | 2014-10-09 18:24:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-09 22:25:46 -0400 |
commit | 5272d036b280d43a06ab790030609225480d2009 (patch) | |
tree | 92d724e9f3a3eeb5c92f9b9b9d486f04f453bc18 /fs | |
parent | 2f82df0f3e6e89867695956aa061b464fe2c8958 (diff) |
ntfs: use find_get_page_flags() to mark page accessed as it is no longer marked later on
Mel Gorman's commit 2457aec63745 ("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: Anton Altaparmakov <anton@tuxera.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ntfs/file.c | 5 | ||||
-rw-r--r-- | fs/ntfs/super.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c index f5ec1ce7a532..643faa44f22b 100644 --- a/fs/ntfs/file.c +++ b/fs/ntfs/file.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * file.c - NTFS kernel file operations. Part of the Linux-NTFS project. | 2 | * file.c - NTFS kernel file operations. Part of the Linux-NTFS project. |
3 | * | 3 | * |
4 | * Copyright (c) 2001-2011 Anton Altaparmakov and Tuxera Inc. | 4 | * Copyright (c) 2001-2014 Anton Altaparmakov and Tuxera Inc. |
5 | * | 5 | * |
6 | * This program/include file is free software; you can redistribute it and/or | 6 | * This program/include file is free software; you can redistribute it and/or |
7 | * modify it under the terms of the GNU General Public License as published | 7 | * 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, | |||
410 | BUG_ON(!nr_pages); | 410 | BUG_ON(!nr_pages); |
411 | err = nr = 0; | 411 | err = nr = 0; |
412 | do { | 412 | do { |
413 | pages[nr] = find_lock_page(mapping, index); | 413 | pages[nr] = find_get_page_flags(mapping, index, FGP_LOCK | |
414 | FGP_ACCESSED); | ||
414 | if (!pages[nr]) { | 415 | if (!pages[nr]) { |
415 | if (!*cached_page) { | 416 | if (!*cached_page) { |
416 | *cached_page = page_cache_alloc(mapping); | 417 | *cached_page = page_cache_alloc(mapping); |
diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c index 6c3296e546c3..9e1e112074fb 100644 --- a/fs/ntfs/super.c +++ b/fs/ntfs/super.c | |||
@@ -3208,7 +3208,7 @@ static void __exit exit_ntfs_fs(void) | |||
3208 | } | 3208 | } |
3209 | 3209 | ||
3210 | MODULE_AUTHOR("Anton Altaparmakov <anton@tuxera.com>"); | 3210 | MODULE_AUTHOR("Anton Altaparmakov <anton@tuxera.com>"); |
3211 | MODULE_DESCRIPTION("NTFS 1.2/3.x driver - Copyright (c) 2001-2011 Anton Altaparmakov and Tuxera Inc."); | 3211 | MODULE_DESCRIPTION("NTFS 1.2/3.x driver - Copyright (c) 2001-2014 Anton Altaparmakov and Tuxera Inc."); |
3212 | MODULE_VERSION(NTFS_VERSION); | 3212 | MODULE_VERSION(NTFS_VERSION); |
3213 | MODULE_LICENSE("GPL"); | 3213 | MODULE_LICENSE("GPL"); |
3214 | #ifdef DEBUG | 3214 | #ifdef DEBUG |