projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
888cf2d
)
mm/memory-failure.c: move comment
author
Naoya Horiguchi
<
[email protected]
>
Wed, 4 Jun 2014 23:10:35 +0000
(16:10 -0700)
committer
Linus Torvalds
<
[email protected]
>
Wed, 4 Jun 2014 23:54:10 +0000
(16:54 -0700)
The comment about pages under writeback is far from the relevant code, so
let's move it to the right place.
Signed-off-by: Naoya Horiguchi <
[email protected]
>
Cc: Andi Kleen <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
mm/memory-failure.c
patch
|
blob
|
history
diff --git
a/mm/memory-failure.c
b/mm/memory-failure.c
index 3cd1b652821c4860cf88fd6ff89c7ee3ab26a063..a0474680c394e4032a01c590f64c3ee7494d1c0d 100644
(file)
--- a/
mm/memory-failure.c
+++ b/
mm/memory-failure.c
@@
-1132,11
+1132,6
@@
int memory_failure(unsigned long pfn, int trapno, int flags)
}
}
- /*
- * Lock the page and wait for writeback to finish.
- * It's very difficult to mess with pages currently under IO
- * and in many cases impossible, so we just avoid it here.
- */
lock_page(hpage);
/*
@@
-1186,6
+1181,10
@@
int memory_failure(unsigned long pfn, int trapno, int flags)
if (PageHuge(p))
set_page_hwpoison_huge_page(hpage);
+ /*
+ * It's very difficult to mess with pages currently under IO
+ * and in many cases impossible, so we just avoid it here.
+ */
wait_on_page_writeback(p);
/*