aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-03-24 06:18:11 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-24 10:33:26 -0500
commit4741c9fd36b3bcadd37238321c469049da94a4b9 (patch)
tree4b3031b04cdbf2d3c5a4fcc1965ed857f1cf0ce4 /mm
parentfa5a734e406b53761fcc5ee22366006f71112c2d (diff)
[PATCH] set_page_dirty() return value fixes
We need set_page_dirty() to return true if it actually transitioned the page from a clean to dirty state. This wasn't right in a couple of places. Do a kernel-wide audit, fix things up. This leaves open the possibility of returning a negative errno from set_page_dirty() sometime in the future. But we don't do that at present. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/page-writeback.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index c67ddc464721..893d7677579e 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -628,8 +628,6 @@ EXPORT_SYMBOL(write_one_page);
628 */ 628 */
629int __set_page_dirty_nobuffers(struct page *page) 629int __set_page_dirty_nobuffers(struct page *page)
630{ 630{
631 int ret = 0;
632
633 if (!TestSetPageDirty(page)) { 631 if (!TestSetPageDirty(page)) {
634 struct address_space *mapping = page_mapping(page); 632 struct address_space *mapping = page_mapping(page);
635 struct address_space *mapping2; 633 struct address_space *mapping2;
@@ -651,8 +649,9 @@ int __set_page_dirty_nobuffers(struct page *page)
651 I_DIRTY_PAGES); 649 I_DIRTY_PAGES);
652 } 650 }
653 } 651 }
652 return 1;
654 } 653 }
655 return ret; 654 return 0;
656} 655}
657EXPORT_SYMBOL(__set_page_dirty_nobuffers); 656EXPORT_SYMBOL(__set_page_dirty_nobuffers);
658 657
@@ -682,8 +681,10 @@ int fastcall set_page_dirty(struct page *page)
682 return (*spd)(page); 681 return (*spd)(page);
683 return __set_page_dirty_buffers(page); 682 return __set_page_dirty_buffers(page);
684 } 683 }
685 if (!PageDirty(page)) 684 if (!PageDirty(page)) {
686 SetPageDirty(page); 685 if (!TestSetPageDirty(page))
686 return 1;
687 }
687 return 0; 688 return 0;
688} 689}
689EXPORT_SYMBOL(set_page_dirty); 690EXPORT_SYMBOL(set_page_dirty);