projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mm: move zone->pages_scanned into a vmstat counter
[firefly-linux-kernel-4.4.55.git]
/
mm
/
filemap.c
diff --git
a/mm/filemap.c
b/mm/filemap.c
index 900edfaf6df5735a1979c866cd288c46c81e50ca..7e85c8147e1b739f9d3c7eb82240b1a49b35da22 100644
(file)
--- a/
mm/filemap.c
+++ b/
mm/filemap.c
@@
-241,18
+241,6
@@
void delete_from_page_cache(struct page *page)
}
EXPORT_SYMBOL(delete_from_page_cache);
}
EXPORT_SYMBOL(delete_from_page_cache);
-static int sleep_on_page(void *word)
-{
- io_schedule();
- return 0;
-}
-
-static int sleep_on_page_killable(void *word)
-{
- sleep_on_page(word);
- return fatal_signal_pending(current) ? -EINTR : 0;
-}
-
static int filemap_check_errors(struct address_space *mapping)
{
int ret = 0;
static int filemap_check_errors(struct address_space *mapping)
{
int ret = 0;
@@
-692,7
+680,7
@@
void wait_on_page_bit(struct page *page, int bit_nr)
DEFINE_WAIT_BIT(wait, &page->flags, bit_nr);
if (test_bit(bit_nr, &page->flags))
DEFINE_WAIT_BIT(wait, &page->flags, bit_nr);
if (test_bit(bit_nr, &page->flags))
- __wait_on_bit(page_waitqueue(page), &wait,
sleep_on_page
,
+ __wait_on_bit(page_waitqueue(page), &wait,
bit_wait_io
,
TASK_UNINTERRUPTIBLE);
}
EXPORT_SYMBOL(wait_on_page_bit);
TASK_UNINTERRUPTIBLE);
}
EXPORT_SYMBOL(wait_on_page_bit);
@@
-705,7
+693,7
@@
int wait_on_page_bit_killable(struct page *page, int bit_nr)
return 0;
return __wait_on_bit(page_waitqueue(page), &wait,
return 0;
return __wait_on_bit(page_waitqueue(page), &wait,
-
sleep_on_page_killable
, TASK_KILLABLE);
+
bit_wait_io
, TASK_KILLABLE);
}
/**
}
/**
@@
-806,7
+794,7
@@
void __lock_page(struct page *page)
{
DEFINE_WAIT_BIT(wait, &page->flags, PG_locked);
{
DEFINE_WAIT_BIT(wait, &page->flags, PG_locked);
- __wait_on_bit_lock(page_waitqueue(page), &wait,
sleep_on_page
,
+ __wait_on_bit_lock(page_waitqueue(page), &wait,
bit_wait_io
,
TASK_UNINTERRUPTIBLE);
}
EXPORT_SYMBOL(__lock_page);
TASK_UNINTERRUPTIBLE);
}
EXPORT_SYMBOL(__lock_page);
@@
-816,7
+804,7
@@
int __lock_page_killable(struct page *page)
DEFINE_WAIT_BIT(wait, &page->flags, PG_locked);
return __wait_on_bit_lock(page_waitqueue(page), &wait,
DEFINE_WAIT_BIT(wait, &page->flags, PG_locked);
return __wait_on_bit_lock(page_waitqueue(page), &wait,
-
sleep_on_page_killable
, TASK_KILLABLE);
+
bit_wait_io
, TASK_KILLABLE);
}
EXPORT_SYMBOL_GPL(__lock_page_killable);
}
EXPORT_SYMBOL_GPL(__lock_page_killable);
@@
-1103,9
+1091,9
@@
no_page:
if (WARN_ON_ONCE(!(fgp_flags & FGP_LOCK)))
fgp_flags |= FGP_LOCK;
if (WARN_ON_ONCE(!(fgp_flags & FGP_LOCK)))
fgp_flags |= FGP_LOCK;
- /* Init accessed so avoi
t
atomic mark_page_accessed later */
+ /* Init accessed so avoi
d
atomic mark_page_accessed later */
if (fgp_flags & FGP_ACCESSED)
if (fgp_flags & FGP_ACCESSED)
-
init_page_access
ed(page);
+
__SetPageReferenc
ed(page);
err = add_to_page_cache_lru(page, mapping, offset, radix_gfp_mask);
if (unlikely(err)) {
err = add_to_page_cache_lru(page, mapping, offset, radix_gfp_mask);
if (unlikely(err)) {