Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 250907
b: refs/heads/master
c: bd48628
h: refs/heads/master
i:
  250905: 7572ea2
  250903: bab40a4
v: v3
  • Loading branch information
Konstantin Khlebnikov authored and Linus Torvalds committed May 25, 2011
1 parent c0dd1cb commit 44ebf0e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 700c2a46e88265326764197d5b8842490bae5569
refs/heads/master: bd486285f24ac2fd1ff64688fb0729712c5712c4
11 changes: 6 additions & 5 deletions trunk/mm/memory-failure.c
Original file line number Diff line number Diff line change
Expand Up @@ -1440,16 +1440,12 @@ int soft_offline_page(struct page *page, int flags)
*/
ret = invalidate_inode_page(page);
unlock_page(page);

/*
* Drop count because page migration doesn't like raised
* counts. The page could get re-allocated, but if it becomes
* LRU the isolation will just fail.
* RED-PEN would be better to keep it isolated here, but we
* would need to fix isolation locking first.
*/
put_page(page);
if (ret == 1) {
put_page(page);
ret = 0;
pr_info("soft_offline: %#lx: invalidated\n", pfn);
goto done;
Expand All @@ -1461,6 +1457,11 @@ int soft_offline_page(struct page *page, int flags)
* handles a large number of cases for us.
*/
ret = isolate_lru_page(page);
/*
* Drop page reference which is came from get_any_page()
* successful isolate_lru_page() already took another one.
*/
put_page(page);
if (!ret) {
LIST_HEAD(pagelist);

Expand Down

0 comments on commit 44ebf0e

Please sign in to comment.